summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt McEuen <matt.mceuen@att.com>2018-09-14 15:53:34 -0500
committerMatt McEuen <matt.mceuen@att.com>2018-10-16 12:43:32 -0500
commiteae60aba15f01fe8058cbfc9782af98ef2926231 (patch)
treefa2071347b5c930f168eafcd4c021b647c6d39c4
parent20f27f628141752a98948453217a897d9df9bf8c (diff)
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
Notes
Notes (review): Code-Review+1: Aaron Sheffield <ajs@sheffieldfamily.net> Code-Review+2: Pete Birley <petebirley@gmail.com> Code-Review+2: Alan Meadows <alan.meadows@gmail.com> Workflow+1: Alan Meadows <alan.meadows@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 06 Nov 2018 19:18:34 +0000 Reviewed-on: https://review.openstack.org/602747 Project: openstack/airship-promenade Branch: refs/heads/master
-rw-r--r--charts/apiserver/templates/daemonset.yaml2
-rw-r--r--charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl2
-rw-r--r--charts/controller_manager/templates/daemonset.yaml2
-rw-r--r--charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl2
-rw-r--r--charts/coredns/templates/deployment.yaml2
-rw-r--r--charts/coredns/templates/pod-test.yaml1
-rw-r--r--charts/etcd/templates/daemonset-anchor.yaml2
-rw-r--r--charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl2
-rw-r--r--charts/etcd/templates/tests/test-etcd-health.yaml1
-rw-r--r--charts/haproxy/templates/daemonset.yaml2
-rw-r--r--charts/haproxy/templates/etc/_haproxy.yaml.tpl2
-rw-r--r--charts/haproxy/templates/tests/test-haproxy-health.yaml1
-rw-r--r--charts/promenade/templates/deployment-api.yaml2
-rw-r--r--charts/promenade/templates/tests/test-promenade-api.yaml1
-rw-r--r--charts/proxy/templates/daemonset.yaml2
-rw-r--r--charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl2
-rw-r--r--charts/scheduler/templates/sched-anchor.yaml2
17 files changed, 30 insertions, 0 deletions
diff --git a/charts/apiserver/templates/daemonset.yaml b/charts/apiserver/templates/daemonset.yaml
index 4c99066..95559c8 100644
--- a/charts/apiserver/templates/daemonset.yaml
+++ b/charts/apiserver/templates/daemonset.yaml
@@ -23,6 +23,8 @@ apiVersion: "extensions/v1beta1"
23kind: DaemonSet 23kind: DaemonSet
24metadata: 24metadata:
25 name: {{ .Values.service.name }}-anchor 25 name: {{ .Values.service.name }}-anchor
26 annotations:
27 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
26spec: 28spec:
27{{ tuple $envAll "kubernetes-apiserver-anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} 29{{ tuple $envAll "kubernetes-apiserver-anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
28 template: 30 template:
diff --git a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl
index 0d2f36d..14a1f83 100644
--- a/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl
+++ b/charts/apiserver/templates/etc/_kubernetes-apiserver.yaml.tpl
@@ -22,6 +22,8 @@ metadata:
22 labels: 22 labels:
23 {{ .Values.service.name }}-service: enabled 23 {{ .Values.service.name }}-service: enabled
24{{ tuple $envAll "kubernetes" "apiserver" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 24{{ tuple $envAll "kubernetes" "apiserver" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
25 annotations:
26 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
25spec: 27spec:
26 hostNetwork: true 28 hostNetwork: true
27 containers: 29 containers:
diff --git a/charts/controller_manager/templates/daemonset.yaml b/charts/controller_manager/templates/daemonset.yaml
index c69e74c..92f428d 100644
--- a/charts/controller_manager/templates/daemonset.yaml
+++ b/charts/controller_manager/templates/daemonset.yaml
@@ -23,6 +23,8 @@ apiVersion: "extensions/v1beta1"
23kind: DaemonSet 23kind: DaemonSet
24metadata: 24metadata:
25 name: {{ .Values.service.name }}-anchor 25 name: {{ .Values.service.name }}-anchor
26 annotations:
27 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
26spec: 28spec:
27{{ tuple $envAll "kubernetes-controller-manager-anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} 29{{ tuple $envAll "kubernetes-controller-manager-anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
28 template: 30 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 733f6f3..8d8c813 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:
22 labels: 22 labels:
23 {{ .Values.service.name }}-service: enabled 23 {{ .Values.service.name }}-service: enabled
24{{ tuple $envAll "kubernetes" "controller-manager" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 24{{ tuple $envAll "kubernetes" "controller-manager" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
25 annotations:
26 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
25spec: 27spec:
26 hostNetwork: true 28 hostNetwork: true
27 containers: 29 containers:
diff --git a/charts/coredns/templates/deployment.yaml b/charts/coredns/templates/deployment.yaml
index e83f761..4358b17 100644
--- a/charts/coredns/templates/deployment.yaml
+++ b/charts/coredns/templates/deployment.yaml
@@ -23,6 +23,8 @@ metadata:
23 labels: 23 labels:
24 {{ .Values.service.name }}: enabled 24 {{ .Values.service.name }}: enabled
25 kubernetes.io/name: "CoreDNS" 25 kubernetes.io/name: "CoreDNS"
26 annotations:
27 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
26spec: 28spec:
27 replicas: {{ .Values.pod.replicas.coredns }} 29 replicas: {{ .Values.pod.replicas.coredns }}
28 strategy: 30 strategy:
diff --git a/charts/coredns/templates/pod-test.yaml b/charts/coredns/templates/pod-test.yaml
index 21583de..3ef3e9a 100644
--- a/charts/coredns/templates/pod-test.yaml
+++ b/charts/coredns/templates/pod-test.yaml
@@ -23,6 +23,7 @@ metadata:
23 name: {{ print .Release.Name "-test" }} 23 name: {{ print .Release.Name "-test" }}
24 annotations: 24 annotations:
25 "helm.sh/hook": test-success 25 "helm.sh/hook": test-success
26 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
26 labels: 27 labels:
27{{ tuple $envAll "coredns" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 28{{ tuple $envAll "coredns" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
28spec: 29spec:
diff --git a/charts/etcd/templates/daemonset-anchor.yaml b/charts/etcd/templates/daemonset-anchor.yaml
index 0931fcc..7426db6 100644
--- a/charts/etcd/templates/daemonset-anchor.yaml
+++ b/charts/etcd/templates/daemonset-anchor.yaml
@@ -26,6 +26,8 @@ apiVersion: extensions/v1beta1
26kind: DaemonSet 26kind: DaemonSet
27metadata: 27metadata:
28 name: {{ .Values.service.name }}-anchor 28 name: {{ .Values.service.name }}-anchor
29 annotations:
30 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
29spec: 31spec:
30{{ tuple $envAll "anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} 32{{ tuple $envAll "anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
31 template: 33 template:
diff --git a/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl b/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl
index c40c0f8..29e21e9 100644
--- a/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl
+++ b/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl
@@ -28,6 +28,8 @@ metadata:
28 labels: 28 labels:
29 {{ .Values.service.name }}-service: enabled 29 {{ .Values.service.name }}-service: enabled
30{{ tuple $envAll $applicationName "etcd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 30{{ tuple $envAll $applicationName "etcd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
31 annotations:
32 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
31spec: 33spec:
32 hostNetwork: true 34 hostNetwork: true
33 containers: 35 containers:
diff --git a/charts/etcd/templates/tests/test-etcd-health.yaml b/charts/etcd/templates/tests/test-etcd-health.yaml
index 4ea55a9..070959e 100644
--- a/charts/etcd/templates/tests/test-etcd-health.yaml
+++ b/charts/etcd/templates/tests/test-etcd-health.yaml
@@ -26,6 +26,7 @@ metadata:
26 annotations: 26 annotations:
27 "helm.sh/hook": "test-success" 27 "helm.sh/hook": "test-success"
28 scheduler.alpha.kubernetes.io/critical-pod: '' 28 scheduler.alpha.kubernetes.io/critical-pod: ''
29 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
29 labels: 30 labels:
30{{ tuple $envAll $applicationName "etcd-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 31{{ tuple $envAll $applicationName "etcd-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
31spec: 32spec:
diff --git a/charts/haproxy/templates/daemonset.yaml b/charts/haproxy/templates/daemonset.yaml
index 5c631b6..b8f5e69 100644
--- a/charts/haproxy/templates/daemonset.yaml
+++ b/charts/haproxy/templates/daemonset.yaml
@@ -20,6 +20,8 @@ apiVersion: extensions/v1beta1
20kind: DaemonSet 20kind: DaemonSet
21metadata: 21metadata:
22 name: haproxy-anchor 22 name: haproxy-anchor
23 annotations:
24 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
23spec: 25spec:
24{{ tuple $envAll "haproxy_anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} 26{{ tuple $envAll "haproxy_anchor" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
25 template: 27 template:
diff --git a/charts/haproxy/templates/etc/_haproxy.yaml.tpl b/charts/haproxy/templates/etc/_haproxy.yaml.tpl
index 9839a72..625709d 100644
--- a/charts/haproxy/templates/etc/_haproxy.yaml.tpl
+++ b/charts/haproxy/templates/etc/_haproxy.yaml.tpl
@@ -23,6 +23,8 @@ metadata:
23 namespace: {{ .Release.Namespace }} 23 namespace: {{ .Release.Namespace }}
24 labels: 24 labels:
25{{ tuple $envAll "haproxy" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 25{{ tuple $envAll "haproxy" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
26 annotations:
27 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
26spec: 28spec:
27 hostNetwork: true 29 hostNetwork: true
28 containers: 30 containers:
diff --git a/charts/haproxy/templates/tests/test-haproxy-health.yaml b/charts/haproxy/templates/tests/test-haproxy-health.yaml
index e1c4fa5..c0d2e5d 100644
--- a/charts/haproxy/templates/tests/test-haproxy-health.yaml
+++ b/charts/haproxy/templates/tests/test-haproxy-health.yaml
@@ -24,6 +24,7 @@ metadata:
24 name: "{{ .Release.Name }}-haproxy-test" 24 name: "{{ .Release.Name }}-haproxy-test"
25 annotations: 25 annotations:
26 "helm.sh/hook": "test-success" 26 "helm.sh/hook": "test-success"
27 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
27 labels: 28 labels:
28{{ tuple $envAll "kubernetes" "haproxy-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 29{{ tuple $envAll "kubernetes" "haproxy-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
29spec: 30spec:
diff --git a/charts/promenade/templates/deployment-api.yaml b/charts/promenade/templates/deployment-api.yaml
index 0415fed..667b7d3 100644
--- a/charts/promenade/templates/deployment-api.yaml
+++ b/charts/promenade/templates/deployment-api.yaml
@@ -21,6 +21,8 @@ apiVersion: extensions/v1beta1
21kind: Deployment 21kind: Deployment
22metadata: 22metadata:
23 name: promenade-api 23 name: promenade-api
24 annotations:
25 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
24spec: 26spec:
25 replicas: {{ .Values.pod.replicas.api }} 27 replicas: {{ .Values.pod.replicas.api }}
26{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} 28{{ 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 2f64002..822113a 100644
--- a/charts/promenade/templates/tests/test-promenade-api.yaml
+++ b/charts/promenade/templates/tests/test-promenade-api.yaml
@@ -25,6 +25,7 @@ metadata:
25 name: "{{ .Release.Name }}-api-test" 25 name: "{{ .Release.Name }}-api-test"
26 annotations: 26 annotations:
27 "helm.sh/hook": "test-success" 27 "helm.sh/hook": "test-success"
28 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
28 labels: 29 labels:
29{{ tuple $envAll "promenade" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 30{{ tuple $envAll "promenade" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
30spec: 31spec:
diff --git a/charts/proxy/templates/daemonset.yaml b/charts/proxy/templates/daemonset.yaml
index 4c991f1..8ed783a 100644
--- a/charts/proxy/templates/daemonset.yaml
+++ b/charts/proxy/templates/daemonset.yaml
@@ -22,6 +22,8 @@ apiVersion: "extensions/v1beta1"
22kind: DaemonSet 22kind: DaemonSet
23metadata: 23metadata:
24 name: kubernetes-proxy 24 name: kubernetes-proxy
25 annotations:
26 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
25spec: 27spec:
26{{ tuple $envAll "proxy" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} 28{{ tuple $envAll "proxy" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
27 template: 29 template:
diff --git a/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl b/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl
index 3467f22..3f1b525 100644
--- a/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl
+++ b/charts/scheduler/templates/etc/_kubernetes-scheduler.yaml.tpl
@@ -24,6 +24,8 @@ metadata:
24 labels: 24 labels:
25 {{ .Values.service.name }}-service: enabled 25 {{ .Values.service.name }}-service: enabled
26{{ tuple $envAll "kubernetes" "scheduler" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 26{{ tuple $envAll "kubernetes" "scheduler" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
27 annotations:
28 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
27spec: 29spec:
28 hostNetwork: true 30 hostNetwork: true
29 containers: 31 containers:
diff --git a/charts/scheduler/templates/sched-anchor.yaml b/charts/scheduler/templates/sched-anchor.yaml
index 2010729..c064667 100644
--- a/charts/scheduler/templates/sched-anchor.yaml
+++ b/charts/scheduler/templates/sched-anchor.yaml
@@ -20,6 +20,8 @@ apiVersion: "extensions/v1beta1"
20kind: DaemonSet 20kind: DaemonSet
21metadata: 21metadata:
22 name: kubernetes-scheduler-anchor 22 name: kubernetes-scheduler-anchor
23 annotations:
24 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
23spec: 25spec:
24{{ tuple $envAll "scheduler" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} 26{{ tuple $envAll "scheduler" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
25 template: 27 template: