From 39f90d13aa7aa2e10e4564a6748009760174b344 Mon Sep 17 00:00:00 2001 From: Danil Grigorev Date: Fri, 4 Oct 2024 10:35:02 +0200 Subject: [PATCH] Add helm labels to allow chart downgrade (#767) - Ensure labels match to previous release for clusterctl-config CM Signed-off-by: Danil-Grigorev --- internal/controllers/clusterctl/config.go | 5 ++++- internal/controllers/clusterctl/config.yaml | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/controllers/clusterctl/config.go b/internal/controllers/clusterctl/config.go index edb7c167..cd49062d 100644 --- a/internal/controllers/clusterctl/config.go +++ b/internal/controllers/clusterctl/config.go @@ -69,7 +69,10 @@ type ConfigImage struct { // Config returns current set of embedded turtles clusterctl overrides. func Config() *corev1.ConfigMap { configMap := config.DeepCopy() - configMap.Namespace = cmp.Or(os.Getenv("POD_NAMESPACE"), "rancher-turtles-system") + + namespace := cmp.Or(os.Getenv("POD_NAMESPACE"), "rancher-turtles-system") + configMap.Namespace = namespace + configMap.Annotations["meta.helm.sh/release-namespace"] = namespace return configMap } diff --git a/internal/controllers/clusterctl/config.yaml b/internal/controllers/clusterctl/config.yaml index dae84ce8..ff73f00d 100644 --- a/internal/controllers/clusterctl/config.yaml +++ b/internal/controllers/clusterctl/config.yaml @@ -2,6 +2,10 @@ apiVersion: v1 kind: ConfigMap metadata: name: clusterctl-config + annotations: + meta.helm.sh/release-name: rancher-turtles + labels: + app.kubernetes.io/managed-by: Helm data: clusterctl.yaml: | providers: