summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt McEuen <matt.mceuen@att.com>2018-09-14 15:51:27 -0500
committerMatt McEuen <matt.mceuen@att.com>2018-09-14 15:51:55 -0500
commit9c2686bea7e5cb4907c929913af7d7fee8136bcb (patch)
tree7e3067013022993b8ba45747007fb58e7d54ccc7
parent582c4d8b2077849ec4dae04ebcb71ab9ed955821 (diff)
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
Notes
Notes (review): Code-Review+2: Pete Birley <petebirley@gmail.com> Code-Review+2: Scott Hussey <sthussey@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 17 Sep 2018 21:17:49 +0000 Reviewed-on: https://review.openstack.org/602746 Project: openstack/airship-maas Branch: refs/heads/master
-rw-r--r--charts/maas/templates/job-bootstrap-admin-user.yaml2
-rw-r--r--charts/maas/templates/job-db-init.yaml2
-rw-r--r--charts/maas/templates/job-db-sync.yaml2
-rw-r--r--charts/maas/templates/job-export-api-key.yaml2
-rw-r--r--charts/maas/templates/job-import.yaml2
-rw-r--r--charts/maas/templates/statefulset-rack.yaml2
-rw-r--r--charts/maas/templates/statefulset-region.yaml2
-rw-r--r--charts/maas/templates/tests/test-maas-init.yaml1
8 files changed, 15 insertions, 0 deletions
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
23kind: Job 23kind: Job
24metadata: 24metadata:
25 name: maas-bootstrap-admin-user 25 name: maas-bootstrap-admin-user
26 annotations:
27 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
26spec: 28spec:
27 template: 29 template:
28 metadata: 30 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
23kind: Job 23kind: Job
24metadata: 24metadata:
25 name: maas-db-init 25 name: maas-db-init
26 annotations:
27 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
26spec: 28spec:
27 template: 29 template:
28 metadata: 30 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
23kind: Job 23kind: Job
24metadata: 24metadata:
25 name: maas-db-sync 25 name: maas-db-sync
26 annotations:
27 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
26spec: 28spec:
27 template: 29 template:
28 metadata: 30 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
25metadata: 25metadata:
26 name: {{ $envAll.Release.Name }}-{{ $serviceAccountName }}-job 26 name: {{ $envAll.Release.Name }}-{{ $serviceAccountName }}-job
27 namespace: {{ $envAll.Release.Namespace }} 27 namespace: {{ $envAll.Release.Namespace }}
28 annotations:
29 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
28roleRef: 30roleRef:
29 apiGroup: rbac.authorization.k8s.io 31 apiGroup: rbac.authorization.k8s.io
30 kind: Role 32 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
23kind: Job 23kind: Job
24metadata: 24metadata:
25 name: maas-import-resources 25 name: maas-import-resources
26 annotations:
27 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
26spec: 28spec:
27 template: 29 template:
28 metadata: 30 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
30kind: StatefulSet 30kind: StatefulSet
31metadata: 31metadata:
32 name: maas-rack 32 name: maas-rack
33 annotations:
34 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
33spec: 35spec:
34 serviceName: maas-rack 36 serviceName: maas-rack
35 replicas: {{ .Values.pod.replicas.rack }} 37 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
24kind: StatefulSet 24kind: StatefulSet
25metadata: 25metadata:
26 name: maas-region 26 name: maas-region
27 annotations:
28 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
27spec: 29spec:
28 serviceName: maas-region-ui 30 serviceName: maas-region-ui
29 replicas: {{ .Values.pod.replicas.region }} 31 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:
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 "maas" "init-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 30{{ tuple $envAll "maas" "init-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
30spec: 31spec: