Integrate metrics changes into 1.25 patch release

This commit is contained in:
Stefan Reimer 2023-05-17 19:05:14 +00:00
parent 8456126e92
commit 8bcaa63eac
3 changed files with 6 additions and 13 deletions

View File

@ -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

View File

@ -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:

View File

@ -89,7 +89,7 @@ logging:
argocd:
enabled: false
namespace: argocd
targetRevision: 0.12.0
targetRevision: 0.12.1
argocd-image-updater:
enabled: false
istio: