From 0350085c57293cbf62e2be9f11b3b3a6076130b5 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 20 Apr 2022 13:15:42 +0200 Subject: [PATCH] feat: cert-manager version bump for 1.22 --- charts/kubezero-cert-manager/Chart.yaml | 6 +-- charts/kubezero-cert-manager/jsonnetfile.json | 2 +- .../jsonnetfile.lock.json | 38 +++++++++---------- .../templates/prometheus-rules.yaml | 3 +- charts/kubezero-cert-manager/update.sh | 4 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/charts/kubezero-cert-manager/Chart.yaml b/charts/kubezero-cert-manager/Chart.yaml index c01372a..742e878 100644 --- a/charts/kubezero-cert-manager/Chart.yaml +++ b/charts/kubezero-cert-manager/Chart.yaml @@ -2,8 +2,7 @@ apiVersion: v2 name: kubezero-cert-manager description: KubeZero Umbrella Chart for cert-manager type: application -version: 0.8.2 -appVersion: 1.6.1 +version: 0.9.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -17,7 +16,6 @@ dependencies: version: ">= 0.1.4" repository: https://cdn.zero-downtime.net/charts/ - name: cert-manager - version: 1.6.1 - condition: cert-manager.enabled + version: 1.8.0 repository: https://charts.jetstack.io kubeVersion: ">= 1.20.0" diff --git a/charts/kubezero-cert-manager/jsonnetfile.json b/charts/kubezero-cert-manager/jsonnetfile.json index 854f92c..4fe5840 100644 --- a/charts/kubezero-cert-manager/jsonnetfile.json +++ b/charts/kubezero-cert-manager/jsonnetfile.json @@ -8,7 +8,7 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "main" + "version": "release-0.10" }, { "source": { diff --git a/charts/kubezero-cert-manager/jsonnetfile.lock.json b/charts/kubezero-cert-manager/jsonnetfile.lock.json index 6be481e..c2794e2 100644 --- a/charts/kubezero-cert-manager/jsonnetfile.lock.json +++ b/charts/kubezero-cert-manager/jsonnetfile.lock.json @@ -18,8 +18,8 @@ "subdir": "contrib/mixin" } }, - "version": "29292aa7bdafaf65cb5e054591fe0ff07b36f5ee", - "sum": "cdKL5kPYfpWSpTCu4qctmh+gWQqL+4YWom6rw9qLYJU=" + "version": "b872757492ca70f350abd44eb95d81b95339f581", + "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc=" }, { "source": { @@ -28,7 +28,7 @@ "subdir": "grafonnet" } }, - "version": "3626fc4dc2326931c530861ac5bebe39444f6cbf", + "version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2", "sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w=" }, { @@ -38,7 +38,7 @@ "subdir": "grafana-builder" } }, - "version": "b102f9ac7d1290ac025c2a7ac99f7fd9a9948503", + "version": "5fb2525651cc6e5100e081b10ad9fbe7e3595231", "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc=" }, { @@ -48,8 +48,8 @@ "subdir": "" } }, - "version": "9821d07e94e9a9916575a234fb699ae3331fa939", - "sum": "xubNXyvDwUw9GZzi9BRb6ob3bYzfoMr5F5zCVn2d7ag=" + "version": "b538a10c89508f8d12885680cca72a134d3127f5", + "sum": "GLt5T2k4RKg36Gfcaf9qlTfVumDitqotVD0ipz/bPJ4=" }, { "source": { @@ -58,7 +58,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "9821d07e94e9a9916575a234fb699ae3331fa939", + "version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5", "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" }, { @@ -68,7 +68,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "e3056ae518d0234105276ec916296923968ad294", + "version": "e080c3ce73ad514254e38dccb37c93bec6b257ae", "sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y=" }, { @@ -78,7 +78,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "e3056ae518d0234105276ec916296923968ad294", + "version": "e080c3ce73ad514254e38dccb37c93bec6b257ae", "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" }, { @@ -88,8 +88,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "9ca30579f61ec51e63d87927d19b9d2a433c7e25", - "sum": "EYlmVYtdVovF3ziMZ9dhV0trzXww6YSz8A2tH2YF9Zw=" + "version": "125fb56d7495e20f504e1537ae949e8261a2f812", + "sum": "QwH53kTe1jWCeXmQe7+U1PBs/a1p4MCTEW3B8IiIxeo=" }, { "source": { @@ -98,7 +98,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "335ebbc2f6ecf10b699821fa8cebcbff4a718ca7", + "version": "d8ba1c766a141cb35072ae2f2578ec8588c9efcd", "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=", "name": "prometheus-operator-mixin" }, @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "335ebbc2f6ecf10b699821fa8cebcbff4a718ca7", - "sum": "Vr2IY6Uz1lYYyGDF7QaEAVkJwAtOEikCfuXJN2eAUM0=" + "version": "d8ba1c766a141cb35072ae2f2578ec8588c9efcd", + "sum": "yjdwZ+5UXL42EavJleAJmd8Ou6MSDfExvlKAxFCxXVE=" }, { "source": { @@ -119,7 +119,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "e2a10119aaf7777fa523d216e05897c5b719134c", + "version": "16fa045db47d68a09a102c7b80b8899c1f57c153", "sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=", "name": "alertmanager" }, @@ -130,7 +130,7 @@ "subdir": "docs/node-mixin" } }, - "version": "7dbf35891570f9ce3bccb25a55176ea4923b35dd", + "version": "a2321e7b940ddcff26873612bccdf7cd4c42b6b6", "sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk=" }, { @@ -140,7 +140,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "c965a7555b7ffcee1a127d782abd5bb478a16750", + "version": "41f1a8125e664985dd30674e5bdf6b683eff5d32", "sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=", "name": "prometheus" }, @@ -151,8 +151,8 @@ "subdir": "mixin" } }, - "version": "d1acaea2a11a3e4db6bb435c98dea63c517e3530", - "sum": "1Y1cPIeoPg2nCAEhKPCt8bAGuwuOP2eZ3kVF432mlMA=", + "version": "fb97c9a5ef51849ccb7960abbeb9581ad7f511b9", + "sum": "X+060DnePPeN/87fgj0SrfxVitywTk8hZA9V4nHxl1g=", "name": "thanos-mixin" }, { diff --git a/charts/kubezero-cert-manager/templates/prometheus-rules.yaml b/charts/kubezero-cert-manager/templates/prometheus-rules.yaml index 45bd495..cbf455b 100644 --- a/charts/kubezero-cert-manager/templates/prometheus-rules.yaml +++ b/charts/kubezero-cert-manager/templates/prometheus-rules.yaml @@ -1,4 +1,3 @@ -{{- if index .Values "cert-manager" "prometheus" "servicemonitor" "enabled" }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: @@ -51,4 +50,4 @@ spec: for: 5m labels: severity: critical -{{- end }} + diff --git a/charts/kubezero-cert-manager/update.sh b/charts/kubezero-cert-manager/update.sh index 783a143..0e5b955 100755 --- a/charts/kubezero-cert-manager/update.sh +++ b/charts/kubezero-cert-manager/update.sh @@ -1,6 +1,8 @@ #!/bin/bash set -ex +helm dep update + # Fetch dashboards from Grafana.com and update ZDT CM ../kubezero-metrics/sync_grafana_dashboards.py dashboards.yaml templates/grafana-dashboards.yaml @@ -12,7 +14,7 @@ which jb > /dev/null || { echo "Required jb ( json-bundler ) not found!"; exit 1 if [ -r jsonnetfile.lock.json ]; then jb update else - jb install github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus@main + jb install github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus@release-0.10 jb install gitlab.com/uneeq-oss/cert-manager-mixin@master fi