From 4ba85d2432c4061fc9951290f7d5b6c624bdddcf Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Wed, 29 Sep 2021 22:12:36 -0500 Subject: [PATCH] Helm 3: Fix Job labels See the dependency below for details. Depends-On: https://review.opendev.org/c/openstack/openstack-helm-infra/+/811826 Change-Id: I9f0d9d99b798a41f8d8ac841e3b00e7d8af40ff3 --- charts/deckhand/templates/job-db-init.yaml | 2 ++ charts/deckhand/templates/job-db-sync.yaml | 2 ++ tools/helm_tk.sh | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/deckhand/templates/job-db-init.yaml b/charts/deckhand/templates/job-db-init.yaml index 36a418de..1ea309af 100644 --- a/charts/deckhand/templates/job-db-init.yaml +++ b/charts/deckhand/templates/job-db-init.yaml @@ -25,6 +25,8 @@ apiVersion: batch/v1 kind: Job metadata: name: deckhand-db-init + labels: +{{ tuple $envAll "deckhand" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: diff --git a/charts/deckhand/templates/job-db-sync.yaml b/charts/deckhand/templates/job-db-sync.yaml index 6f3ce564..9343754c 100644 --- a/charts/deckhand/templates/job-db-sync.yaml +++ b/charts/deckhand/templates/job-db-sync.yaml @@ -25,6 +25,8 @@ apiVersion: batch/v1 kind: Job metadata: name: deckhand-db-sync + labels: +{{ tuple $envAll "deckhand" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh index bb6d1fc6..9aafac08 100755 --- a/tools/helm_tk.sh +++ b/tools/helm_tk.sh @@ -18,7 +18,7 @@ HELM=$1 HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"} HTK_PATH=${HTK_PATH:-""} -HTK_STABLE_COMMIT=${HTK_COMMIT:-"830df06628e4257ddc656a8869f3705e7b148f49"} +HTK_STABLE_COMMIT=${HTK_COMMIT:-"b1a247e7f54ab12d830ab74f7634457b4e43f3ef"} BUILD_DIR=${BUILD_DIR:-$(mktemp -d)} if [[ ! -z $(echo $http_proxy) ]]