diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml index eec0cd1f..c1e85fe5 100644 --- a/charts/kubezero/Chart.yaml +++ b/charts/kubezero/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero description: KubeZero - Bootstrap and ArgoCD Root App of Apps chart type: application -version: 1.20.8-11 +version: 1.20.8-12 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md index 5734f894..3230c6dd 100644 --- a/charts/kubezero/README.md +++ b/charts/kubezero/README.md @@ -1,6 +1,6 @@ # kubezero -![Version: 1.20.8-11](https://img.shields.io/badge/Version-1.20.8--11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 1.20.8-12](https://img.shields.io/badge/Version-1.20.8--12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero - Bootstrap and ArgoCD Root App of Apps chart @@ -44,7 +44,7 @@ Kubernetes: `>= 1.18.0` | cert-manager.crds | bool | `true` | | | cert-manager.enabled | bool | `false` | | | cert-manager.namespace | string | `"cert-manager"` | | -| cert-manager.targetRevision | string | `"0.7.0"` | | +| cert-manager.targetRevision | string | `"0.7.3"` | | | istio-ingress.enabled | bool | `false` | | | istio-ingress.namespace | string | `"istio-ingress"` | | | istio-ingress.targetRevision | string | `"0.7.5"` | | @@ -67,7 +67,7 @@ Kubernetes: `>= 1.18.0` | metrics.istio.grafana | object | `{}` | | | metrics.istio.prometheus | object | `{}` | | | metrics.namespace | string | `"monitoring"` | | -| metrics.targetRevision | string | `"0.5.2"` | | +| metrics.targetRevision | string | `"0.5.4"` | | | storage.crds | bool | `true` | | | storage.enabled | bool | `false` | | | storage.targetRevision | string | `"0.3.0"` | | diff --git a/charts/kubezero/templates/metrics.yaml b/charts/kubezero/templates/metrics.yaml index a6a776c1..c8ef51ba 100644 --- a/charts/kubezero/templates/metrics.yaml +++ b/charts/kubezero/templates/metrics.yaml @@ -1,9 +1,5 @@ {{- define "metrics-values" }} -{{- with .Values.metrics.additionalRuleLabels }} -additionalRuleLabels: -{{- toYaml . | nindent 2 }} -{{- end }} {{- with .Values.metrics.istio }} istio: {{- toYaml . | nindent 2 }} diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml index 56ba25d8..4036b01f 100644 --- a/charts/kubezero/values.yaml +++ b/charts/kubezero/values.yaml @@ -20,7 +20,7 @@ cert-manager: enabled: false crds: true namespace: cert-manager - targetRevision: 0.7.0 + targetRevision: 0.7.3 kiam: enabled: false @@ -55,7 +55,7 @@ metrics: enabled: false crds: true namespace: monitoring - targetRevision: 0.5.2 + targetRevision: 0.5.4 istio: grafana: {} prometheus: {}