From 9c2686bea7e5cb4907c929913af7d7fee8136bcb Mon Sep 17 00:00:00 2001 From: Matt McEuen Date: Fri, 14 Sep 2018 15:51:27 -0500 Subject: [PATCH] Add release uuid to pods and rc objects (maas) This PS adds the ability to attach a release uuid to pods and rc objects as desired. This can be used, for example, to force an artificial manifest change in CICD scenarios, for upgradability testing purposes. Change-Id: I994f9eb9cd75947ee36276a542fa23cc547065e0 --- charts/maas/templates/job-bootstrap-admin-user.yaml | 2 ++ charts/maas/templates/job-db-init.yaml | 2 ++ charts/maas/templates/job-db-sync.yaml | 2 ++ charts/maas/templates/job-export-api-key.yaml | 2 ++ charts/maas/templates/job-import.yaml | 2 ++ charts/maas/templates/statefulset-rack.yaml | 2 ++ charts/maas/templates/statefulset-region.yaml | 2 ++ charts/maas/templates/tests/test-maas-init.yaml | 1 + 8 files changed, 15 insertions(+) diff --git a/charts/maas/templates/job-bootstrap-admin-user.yaml b/charts/maas/templates/job-bootstrap-admin-user.yaml index f890827..8e26931 100644 --- a/charts/maas/templates/job-bootstrap-admin-user.yaml +++ b/charts/maas/templates/job-bootstrap-admin-user.yaml @@ -23,6 +23,8 @@ apiVersion: batch/v1 kind: Job metadata: name: maas-bootstrap-admin-user + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/charts/maas/templates/job-db-init.yaml b/charts/maas/templates/job-db-init.yaml index d8d265f..025a5c3 100644 --- a/charts/maas/templates/job-db-init.yaml +++ b/charts/maas/templates/job-db-init.yaml @@ -23,6 +23,8 @@ apiVersion: batch/v1 kind: Job metadata: name: maas-db-init + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/charts/maas/templates/job-db-sync.yaml b/charts/maas/templates/job-db-sync.yaml index 8e9e1b4..edf492f 100644 --- a/charts/maas/templates/job-db-sync.yaml +++ b/charts/maas/templates/job-db-sync.yaml @@ -23,6 +23,8 @@ apiVersion: batch/v1 kind: Job metadata: name: maas-db-sync + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/charts/maas/templates/job-export-api-key.yaml b/charts/maas/templates/job-export-api-key.yaml index ae065be..77a76ac 100644 --- a/charts/maas/templates/job-export-api-key.yaml +++ b/charts/maas/templates/job-export-api-key.yaml @@ -25,6 +25,8 @@ kind: RoleBinding metadata: name: {{ $envAll.Release.Name }}-{{ $serviceAccountName }}-job namespace: {{ $envAll.Release.Namespace }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/charts/maas/templates/job-import.yaml b/charts/maas/templates/job-import.yaml index b925827..bf032d4 100644 --- a/charts/maas/templates/job-import.yaml +++ b/charts/maas/templates/job-import.yaml @@ -23,6 +23,8 @@ apiVersion: batch/v1 kind: Job metadata: name: maas-import-resources + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: metadata: diff --git a/charts/maas/templates/statefulset-rack.yaml b/charts/maas/templates/statefulset-rack.yaml index a127ff8..3086222 100644 --- a/charts/maas/templates/statefulset-rack.yaml +++ b/charts/maas/templates/statefulset-rack.yaml @@ -30,6 +30,8 @@ apiVersion: apps/v1beta1 kind: StatefulSet metadata: name: maas-rack + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: serviceName: maas-rack replicas: {{ .Values.pod.replicas.rack }} diff --git a/charts/maas/templates/statefulset-region.yaml b/charts/maas/templates/statefulset-region.yaml index 266af26..0f72dd8 100644 --- a/charts/maas/templates/statefulset-region.yaml +++ b/charts/maas/templates/statefulset-region.yaml @@ -24,6 +24,8 @@ apiVersion: apps/v1beta1 kind: StatefulSet metadata: name: maas-region + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: serviceName: maas-region-ui replicas: {{ .Values.pod.replicas.region }} diff --git a/charts/maas/templates/tests/test-maas-init.yaml b/charts/maas/templates/tests/test-maas-init.yaml index fda93aa..f574c52 100644 --- a/charts/maas/templates/tests/test-maas-init.yaml +++ b/charts/maas/templates/tests/test-maas-init.yaml @@ -25,6 +25,7 @@ metadata: name: "{{ .Release.Name }}-api-test" annotations: "helm.sh/hook": "test-success" + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "maas" "init-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: