summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-04 21:27:18 +0000
committerGerrit Code Review <review@openstack.org>2018-10-04 21:27:18 +0000
commitc38a38fa4ca54f34f469e9866dae0838ac205369 (patch)
tree2f08507856ef2e2f27a3ff61eaa84d843d8a3126
parent9625febab6807f72d1ba0b44f9311dcff658389e (diff)
parentd8f4a1fbe3b4d2ac9ed097bcb5ab575f134d99f6 (diff)
Merge "Add release uuid to pods and rc objects (drydock)"
-rw-r--r--charts/drydock/templates/deployment.yaml2
-rw-r--r--charts/drydock/templates/job-drydock-db-init.yaml2
-rw-r--r--charts/drydock/templates/job-drydock-db-sync.yaml2
-rw-r--r--charts/drydock/templates/tests/test-drydock-api.yaml1
-rw-r--r--charts/drydock/templates/tests/test-drydock-auth.yaml1
-rwxr-xr-xtools/helm_tk.sh2
6 files changed, 9 insertions, 1 deletions
diff --git a/charts/drydock/templates/deployment.yaml b/charts/drydock/templates/deployment.yaml
index 6a9b6e8..cc75741 100644
--- a/charts/drydock/templates/deployment.yaml
+++ b/charts/drydock/templates/deployment.yaml
@@ -22,6 +22,8 @@ apiVersion: apps/v1beta1
22kind: Deployment 22kind: Deployment
23metadata: 23metadata:
24 name: drydock-api 24 name: drydock-api
25 annotations:
26 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
25spec: 27spec:
26 replicas: {{ .Values.replicas.drydock }} 28 replicas: {{ .Values.replicas.drydock }}
27{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} 29{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
diff --git a/charts/drydock/templates/job-drydock-db-init.yaml b/charts/drydock/templates/job-drydock-db-init.yaml
index 4591ed1..0550361 100644
--- a/charts/drydock/templates/job-drydock-db-init.yaml
+++ b/charts/drydock/templates/job-drydock-db-init.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
23kind: Job 23kind: Job
24metadata: 24metadata:
25 name: drydock-db-init 25 name: drydock-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/drydock/templates/job-drydock-db-sync.yaml b/charts/drydock/templates/job-drydock-db-sync.yaml
index dd8a061..5c4aeb5 100644
--- a/charts/drydock/templates/job-drydock-db-sync.yaml
+++ b/charts/drydock/templates/job-drydock-db-sync.yaml
@@ -23,6 +23,8 @@ apiVersion: batch/v1
23kind: Job 23kind: Job
24metadata: 24metadata:
25 name: drydock-db-sync 25 name: drydock-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/drydock/templates/tests/test-drydock-api.yaml b/charts/drydock/templates/tests/test-drydock-api.yaml
index e5fdfc2..7c3930e 100644
--- a/charts/drydock/templates/tests/test-drydock-api.yaml
+++ b/charts/drydock/templates/tests/test-drydock-api.yaml
@@ -24,6 +24,7 @@ metadata:
24 name: "{{ .Release.Name }}-api-test" 24 name: "{{ .Release.Name }}-api-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 "drydock" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 29{{ tuple $envAll "drydock" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
29spec: 30spec:
diff --git a/charts/drydock/templates/tests/test-drydock-auth.yaml b/charts/drydock/templates/tests/test-drydock-auth.yaml
index 758f012..15b6f6d 100644
--- a/charts/drydock/templates/tests/test-drydock-auth.yaml
+++ b/charts/drydock/templates/tests/test-drydock-auth.yaml
@@ -25,6 +25,7 @@ metadata:
25 name: "{{ .Release.Name }}-auth-test" 25 name: "{{ .Release.Name }}-auth-test"
26 annotations: 26 annotations:
27 helm.sh/hook: "test-failure" 27 helm.sh/hook: "test-failure"
28 {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
28 labels: 29 labels:
29{{ tuple $envAll "drydock" "auth-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 30{{ tuple $envAll "drydock" "auth-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
30spec: 31spec:
diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh
index 9260734..1a1a366 100755
--- a/tools/helm_tk.sh
+++ b/tools/helm_tk.sh
@@ -18,7 +18,7 @@
18HELM=$1 18HELM=$1
19HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"} 19HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"}
20HTK_PATH=${HTK_PATH:-""} 20HTK_PATH=${HTK_PATH:-""}
21HTK_STABLE_COMMIT=${HTK_COMMIT:-"274b230dcc8960af4fe44a871addcb5aacef3dba"} 21HTK_STABLE_COMMIT=${HTK_COMMIT:-"2fce7e821201a5f578331370703e164d5a932fcc"}
22DEP_UP_LIST=${DEP_UP_LIST:-"drydock"} 22DEP_UP_LIST=${DEP_UP_LIST:-"drydock"}
23BUILD_DIR=${BUILD_DIR:-$(mktemp -d)} 23BUILD_DIR=${BUILD_DIR:-$(mktemp -d)}
24 24