airship
/
armada
Code Issues Proposed changes

Merge "Fix release_uuid annotations"

This commit is contained in:
Zuul 2019-09-05 17:25:10 +00:00 committed by Gerrit Code Review
parent 243022d16c 42b972181a
commit cb0d90839a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/armada/templates/deployment-api.yaml
View File

@ -71,7 +71,7 @@ kind: Deployment
metadata:
name: armada-api
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 4 }}
spec:
replicas: {{ .Values.pod.replicas.api }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
@ -80,6 +80,7 @@ spec:
labels:
{{ tuple $envAll "armada" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
{{ tuple $prometheus_annotations | include "helm-toolkit.snippets.prometheus_pod_annotations" | indent 8 }}

4
charts/tiller/templates/deployment-tiller.yaml
View File

@ -40,7 +40,7 @@ metadata:
name: tiller
name: tiller-deploy
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 4 }}
spec:
replicas: 1
selector:
@ -58,7 +58,7 @@ spec:
app: helm
name: tiller
{{ tuple $envAll "tiller" "deploy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}