From eae60aba15f01fe8058cbfc9782af98ef2926231 Mon Sep 17 00:00:00 2001 From: Matt McEuen Date: Fri, 14 Sep 2018 15:53:34 -0500 Subject: [PATCH] Add release uuid to pods and rc objects (prom) 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: I8d0ffac306258f940c63799e86e7e26b5c2c5add --- charts/apiserver/templates/daemonset.yaml | 2 ++ charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl | 2 ++ charts/controller_manager/templates/daemonset.yaml | 2 ++ .../templates/etc/_kubernetes-controller-manager.yaml.tpl | 2 ++ charts/coredns/templates/deployment.yaml | 2 ++ charts/coredns/templates/pod-test.yaml | 1 + charts/etcd/templates/daemonset-anchor.yaml | 2 ++ charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl | 2 ++ charts/etcd/templates/tests/test-etcd-health.yaml | 1 + charts/haproxy/templates/daemonset.yaml | 2 ++ charts/haproxy/templates/etc/_haproxy.yaml.tpl | 2 ++ charts/haproxy/templates/tests/test-haproxy-health.yaml | 1 + charts/promenade/templates/deployment-api.yaml | 2 ++ charts/promenade/templates/tests/test-promenade-api.yaml | 1 + charts/proxy/templates/daemonset.yaml | 2 ++ charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl | 2 ++ charts/scheduler/templates/sched-anchor.yaml | 2 ++ 17 files changed, 30 insertions(+) diff --git a/charts/apiserver/templates/daemonset.yaml b/charts/apiserver/templates/daemonset.yaml index 4c990668..95559c8a 100644 --- a/charts/apiserver/templates/daemonset.yaml +++ b/charts/apiserver/templates/daemonset.yaml @@ -23,6 +23,8 @@ apiVersion: "extensions/v1beta1" kind: DaemonSet metadata: name: {{ .Values.service.name }}-anchor + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ tuple $envAll "kubernetes-apiserver-anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} template: diff --git a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl index 0d2f36da..14a1f83c 100644 --- a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl +++ b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl @@ -22,6 +22,8 @@ metadata: labels: {{ .Values.service.name }}-service: enabled {{ tuple $envAll "kubernetes" "apiserver" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: hostNetwork: true containers: diff --git a/charts/controller_manager/templates/daemonset.yaml b/charts/controller_manager/templates/daemonset.yaml index c69e74ce..92f428d1 100644 --- a/charts/controller_manager/templates/daemonset.yaml +++ b/charts/controller_manager/templates/daemonset.yaml @@ -23,6 +23,8 @@ apiVersion: "extensions/v1beta1" kind: DaemonSet metadata: name: {{ .Values.service.name }}-anchor + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ tuple $envAll "kubernetes-controller-manager-anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} template: diff --git a/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl b/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl index 733f6f3b..8d8c8133 100644 --- a/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl +++ b/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl @@ -22,6 +22,8 @@ metadata: labels: {{ .Values.service.name }}-service: enabled {{ tuple $envAll "kubernetes" "controller-manager" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: hostNetwork: true containers: diff --git a/charts/coredns/templates/deployment.yaml b/charts/coredns/templates/deployment.yaml index e83f7611..4358b17e 100644 --- a/charts/coredns/templates/deployment.yaml +++ b/charts/coredns/templates/deployment.yaml @@ -23,6 +23,8 @@ metadata: labels: {{ .Values.service.name }}: enabled kubernetes.io/name: "CoreDNS" + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: replicas: {{ .Values.pod.replicas.coredns }} strategy: diff --git a/charts/coredns/templates/pod-test.yaml b/charts/coredns/templates/pod-test.yaml index 21583def..3ef3e9a5 100644 --- a/charts/coredns/templates/pod-test.yaml +++ b/charts/coredns/templates/pod-test.yaml @@ -23,6 +23,7 @@ metadata: name: {{ print .Release.Name "-test" }} annotations: "helm.sh/hook": test-success + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "coredns" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/charts/etcd/templates/daemonset-anchor.yaml b/charts/etcd/templates/daemonset-anchor.yaml index 0931fccb..7426db60 100644 --- a/charts/etcd/templates/daemonset-anchor.yaml +++ b/charts/etcd/templates/daemonset-anchor.yaml @@ -26,6 +26,8 @@ apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: {{ .Values.service.name }}-anchor + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ tuple $envAll "anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} template: diff --git a/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl b/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl index c40c0f8b..29e21e97 100644 --- a/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl +++ b/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl @@ -28,6 +28,8 @@ metadata: labels: {{ .Values.service.name }}-service: enabled {{ tuple $envAll $applicationName "etcd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: hostNetwork: true containers: diff --git a/charts/etcd/templates/tests/test-etcd-health.yaml b/charts/etcd/templates/tests/test-etcd-health.yaml index 4ea55a91..070959e9 100644 --- a/charts/etcd/templates/tests/test-etcd-health.yaml +++ b/charts/etcd/templates/tests/test-etcd-health.yaml @@ -26,6 +26,7 @@ metadata: annotations: "helm.sh/hook": "test-success" scheduler.alpha.kubernetes.io/critical-pod: '' + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll $applicationName "etcd-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/charts/haproxy/templates/daemonset.yaml b/charts/haproxy/templates/daemonset.yaml index 5c631b61..b8f5e694 100644 --- a/charts/haproxy/templates/daemonset.yaml +++ b/charts/haproxy/templates/daemonset.yaml @@ -20,6 +20,8 @@ apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: haproxy-anchor + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ tuple $envAll "haproxy_anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} template: diff --git a/charts/haproxy/templates/etc/_haproxy.yaml.tpl b/charts/haproxy/templates/etc/_haproxy.yaml.tpl index 9839a72b..625709d5 100644 --- a/charts/haproxy/templates/etc/_haproxy.yaml.tpl +++ b/charts/haproxy/templates/etc/_haproxy.yaml.tpl @@ -23,6 +23,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{ tuple $envAll "haproxy" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: hostNetwork: true containers: diff --git a/charts/haproxy/templates/tests/test-haproxy-health.yaml b/charts/haproxy/templates/tests/test-haproxy-health.yaml index e1c4fa59..c0d2e5de 100644 --- a/charts/haproxy/templates/tests/test-haproxy-health.yaml +++ b/charts/haproxy/templates/tests/test-haproxy-health.yaml @@ -24,6 +24,7 @@ metadata: name: "{{ .Release.Name }}-haproxy-test" annotations: "helm.sh/hook": "test-success" + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} labels: {{ tuple $envAll "kubernetes" "haproxy-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/charts/promenade/templates/deployment-api.yaml b/charts/promenade/templates/deployment-api.yaml index 0415fed1..667b7d31 100644 --- a/charts/promenade/templates/deployment-api.yaml +++ b/charts/promenade/templates/deployment-api.yaml @@ -21,6 +21,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: promenade-api + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: replicas: {{ .Values.pod.replicas.api }} {{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} diff --git a/charts/promenade/templates/tests/test-promenade-api.yaml b/charts/promenade/templates/tests/test-promenade-api.yaml index 2f640022..822113a3 100644 --- a/charts/promenade/templates/tests/test-promenade-api.yaml +++ b/charts/promenade/templates/tests/test-promenade-api.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 "promenade" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: diff --git a/charts/proxy/templates/daemonset.yaml b/charts/proxy/templates/daemonset.yaml index 4c991f13..8ed783a3 100644 --- a/charts/proxy/templates/daemonset.yaml +++ b/charts/proxy/templates/daemonset.yaml @@ -22,6 +22,8 @@ apiVersion: "extensions/v1beta1" kind: DaemonSet metadata: name: kubernetes-proxy + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ tuple $envAll "proxy" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} template: diff --git a/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl b/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl index 3467f222..3f1b5257 100644 --- a/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl +++ b/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl @@ -24,6 +24,8 @@ metadata: labels: {{ .Values.service.name }}-service: enabled {{ tuple $envAll "kubernetes" "scheduler" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: hostNetwork: true containers: diff --git a/charts/scheduler/templates/sched-anchor.yaml b/charts/scheduler/templates/sched-anchor.yaml index 20107290..c0646671 100644 --- a/charts/scheduler/templates/sched-anchor.yaml +++ b/charts/scheduler/templates/sched-anchor.yaml @@ -20,6 +20,8 @@ apiVersion: "extensions/v1beta1" kind: DaemonSet metadata: name: kubernetes-scheduler-anchor + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: {{ tuple $envAll "scheduler" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} template: