airship
/
airship-in-a-bottle
Code Issues Proposed changes

Add env vars to support tiller charts 

Change-Id: Ie8a09709736b3c69ce2e308445223b5ca11ca22a
This commit is contained in:
Bryan Strassner 2018-01-27 17:14:59 -06:00
parent d0bc4e28fd
commit 82f0312ffa
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/basic_ucp/armada-resources.yaml.sub
View File

@ -864,15 +864,15 @@ data:
values:
images:
tags:
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
tiller: ${TILLER_IMAGE}
labels:
node_selector_key: ucp-control-plane
node_selector_value: enabled
source:
type: git
location: https://github.com/att-comdev/armada
subpath: charts/tiller
reference: master
location: ${TILLER_CHART_REPO}
subpath: ${TILLER_CHART_PATH}
reference: ${TILLER_CHART_BRANCH}
dependencies:
- helm-toolkit
...

3
manifests/basic_ucp/deploy_ucp.sh
View File

@ -77,6 +77,9 @@ function init_env {
export DIVINGBELL_CHART_REPO=${DIVINGBELL_CHART_REPO:-"https://github.com/att-comdev/divingbell"}
export DIVINGBELL_CHART_PATH=${DIVINGBELL_CHART_PATH:-"divingbell"}
export DIVINGBELL_CHART_BRANCH=${DIVINGBELL_CHART_BRANCH:-"master"}
export TILLER_CHART_REPO=${TILLER_CHART_REPO:-"https://github.com/att-comdev/armada"}
export TILLER_CHART_PATH=${TILLER_CHART_PATH:-"charts/tiller"}
export TILLER_CHART_BRANCH=${TILLER_CHART_BRANCH:-"master"}
#Kubernetes artifacts
export KUBE_PROXY_IMAGE=${KUBE_PROXY_IMAGE:-"gcr.io/google_containers/hyperkube-amd64:v1.8.6"}