From 2f823c69d260df2b77101b29d5413e6cbed7c464 Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Fri, 1 Oct 2021 12:36:19 -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: Ib7730c5cbcaa95dab615baac1efda310e5a52fcc --- charts/apiserver/templates/job-key-rotate.yaml | 2 ++ tools/helm_tk.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/apiserver/templates/job-key-rotate.yaml b/charts/apiserver/templates/job-key-rotate.yaml index dffa30d1..0d614c95 100644 --- a/charts/apiserver/templates/job-key-rotate.yaml +++ b/charts/apiserver/templates/job-key-rotate.yaml @@ -84,6 +84,8 @@ apiVersion: batch/v1 kind: Job metadata: name: apiserver-key-rotate + labels: +{{ tuple $envAll "kube-apiserver" "key-rotate" | 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 47814d29..a305bfec 100755 --- a/tools/helm_tk.sh +++ b/tools/helm_tk.sh @@ -17,7 +17,7 @@ set -eux HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm-infra.git"} -HTK_STABLE_COMMIT=${HTK_COMMIT:-"4a490b894ce2a3c547075a5559de58fd07124401"} +HTK_STABLE_COMMIT=${HTK_COMMIT:-"b1a247e7f54ab12d830ab74f7634457b4e43f3ef"} TMP_DIR=$(mktemp -d)