From c90fa60e2a156953563ea9fd9d9aa848171c8325 Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Fri, 1 Oct 2021 13:02:00 -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: Id72e8c97603aa205ea1d071e6b99ad81513bacfc --- charts/drydock/templates/job-drydock-db-init.yaml | 2 ++ charts/drydock/templates/job-drydock-db-sync.yaml | 2 ++ tools/helm_tk.sh | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/drydock/templates/job-drydock-db-init.yaml b/charts/drydock/templates/job-drydock-db-init.yaml index 5c82a5df..d8e57558 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 kind: Job metadata: name: drydock-db-init + labels: +{{ tuple $envAll "drydock" "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/drydock/templates/job-drydock-db-sync.yaml b/charts/drydock/templates/job-drydock-db-sync.yaml index ddb5942d..d398644f 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 kind: Job metadata: name: drydock-db-sync + labels: +{{ tuple $envAll "drydock" "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 92d9952e..4c2d2cfa 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:-"9797d1b034529c9739c19a30193c3605321fcf91"} +HTK_STABLE_COMMIT=${HTK_COMMIT:-"b1a247e7f54ab12d830ab74f7634457b4e43f3ef"} DEP_UP_LIST=${DEP_UP_LIST:-"drydock"} BUILD_DIR=${BUILD_DIR:-$(mktemp -d)}