diff --git a/admin/migrate_argo_values.py b/admin/migrate_argo_values.py index 4601648a..680d7233 100755 --- a/admin/migrate_argo_values.py +++ b/admin/migrate_argo_values.py @@ -8,18 +8,11 @@ import yaml def migrate(values): """Actual changes here""" - # Move additional prometheus labels to better config tree - try: - labels = {} - for c in values["metrics"]['kube-prometheus-stack']["prometheus"]["prometheusSpec"]["additionalAlertRelabelConfigs"]: - labels[c["target_label"]] = c["replacement"] - - values["metrics"]['kube-prometheus-stack']["prometheus"]["prometheusSpec"]["externalLabels"] = labels - deleteKey(values["metrics"]['kube-prometheus-stack']["prometheus"]["prometheusSpec"], "additionalAlertRelabelConfigs") + # Remove various keys as they have been merged into the metrics template + deleteKey(values["metrics"]['kube-prometheus-stack']["alertmanager"]["alertmanagerSpec"], "podMetadata") + deleteKey(values["metrics"]['kube-prometheus-stack']["alertmanager"], "config") + deleteKey(values["metrics"]['kube-prometheus-stack']["prometheus"]["prometheusSpec"], "externalLabels") - except KeyError: - pass - return values diff --git a/charts/kubezero-argocd/Chart.yaml b/charts/kubezero-argocd/Chart.yaml index c2e192c7..9c828403 100644 --- a/charts/kubezero-argocd/Chart.yaml +++ b/charts/kubezero-argocd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: KubeZero ArgoCD - config, branding, image-updater (optional) name: kubezero-argocd -version: 0.12.1 +version: 0.12.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index 029ee0e2..f19a8cd9 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -89,7 +89,7 @@ logging: argocd: enabled: false namespace: argocd - targetRevision: 0.12.0 + targetRevision: 0.12.1 argocd-image-updater: enabled: false istio: