Make tiller verbosity tunable

- conf.tiller.verbosity now sets the verbosity that tiller
  runs at within the pod. Default is "5".
- Update Makefile and helm_tk.sh so that 'make dry-run' and
  'make helm-lint' works for both tiller and armada charts

Change-Id: Ie1a8f2b44ea626af251915a762db3846784b4da4
This commit is contained in:
Scott Hussey 2018-03-07 14:11:46 -06:00
parent 7a2ba22ab1
commit 59ae1fd767
4 changed files with 16 additions and 6 deletions

View File

@ -5,7 +5,7 @@ IMAGE_NAME ?= armada
HELM ?= helm
LABEL ?= commit-id
PYTHON = python3
CHART = charts/armada
CHART = armada
# VERSION INFO
GIT_COMMIT = $(shell git rev-parse HEAD)
@ -65,7 +65,8 @@ images: check-docker
.PHONY: dry-run
dry-run: clean
tools/helm_tk.sh $(HELM)
$(HELM) template $(CHART)
$(HELM) dep up charts/$(CHART)
$(HELM) template charts/$(CHART)
# make tools
.PHONY: protoc
@ -104,9 +105,10 @@ test-pep8: check-tox
.PHONY: helm-lint
helm_lint:
@tools/helm_tk.sh $(HELM)
$(HELM) lint $(CHART)
$(HELM) dep up charts/$(CHART)
$(HELM) lint charts/$(CHART)
.PHONY: charts
charts: clean
$(HELM) dep up $(CHART)
$(HELM) package $(CHART)
$(HELM) dep up charts/$(CHART)
$(HELM) package charts/$(CHART)

View File

@ -76,6 +76,11 @@ spec:
successThreshold: 1
timeoutSeconds: 1
name: tiller
command:
- /tiller
- -logtostderr
- -v
- {{ .Values.conf.tiller.verbosity | quote }}
ports:
- containerPort: 44134
name: tiller

View File

@ -32,6 +32,10 @@ deployment:
# no limit.
tiller_history: 0
conf:
tiller:
verbosity: 5
manifests:
deployment_tiller: true
service_tiller_deploy: true

View File

@ -49,4 +49,3 @@ cd openstack-helm
git pull
helm_serve
make charts
${HELM} dep up ../../charts/armada