From a16300f94ec59b27072820a66a380651364e4712 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 21 Oct 2021 17:10:13 +0200
Subject: [PATCH] chore: kubezero version bump incl. latest logging

---
 charts/kubezero/Chart.yaml                  |  2 +-
 charts/kubezero/README.md                   |  8 ++++----
 charts/kubezero/templates/cert-manager.yaml | 10 +++++-----
 charts/kubezero/values.yaml                 |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index c1e85fe..8e6c3a5 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-12
+version: 1.20.8-13
 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 3230c6d..2958bf8 100644
--- a/charts/kubezero/README.md
+++ b/charts/kubezero/README.md
@@ -1,6 +1,6 @@
 # kubezero
 
-![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)
+![Version: 1.20.8-13](https://img.shields.io/badge/Version-1.20.8--13-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
 
@@ -31,7 +31,7 @@ Kubernetes: `>= 1.18.0`
 | argocd.enabled | bool | `false` |  |
 | argocd.istio.enabled | bool | `false` |  |
 | argocd.namespace | string | `"argocd"` |  |
-| argocd.targetRevision | string | `"0.8.2"` |  |
+| argocd.targetRevision | string | `"0.8.4"` |  |
 | aws-ebs-csi-driver.crds | bool | `true` |  |
 | aws-ebs-csi-driver.enabled | bool | `false` |  |
 | aws-ebs-csi-driver.targetRevision | string | `"0.6.4"` |  |
@@ -61,7 +61,7 @@ Kubernetes: `>= 1.18.0`
 | logging.crds | bool | `true` |  |
 | logging.enabled | bool | `false` |  |
 | logging.namespace | string | `"logging"` |  |
-| logging.targetRevision | string | `"0.7.13"` |  |
+| logging.targetRevision | string | `"0.7.14"` |  |
 | metrics.crds | bool | `true` |  |
 | metrics.enabled | bool | `false` |  |
 | metrics.istio.grafana | object | `{}` |  |
@@ -70,7 +70,7 @@ Kubernetes: `>= 1.18.0`
 | metrics.targetRevision | string | `"0.5.4"` |  |
 | storage.crds | bool | `true` |  |
 | storage.enabled | bool | `false` |  |
-| storage.targetRevision | string | `"0.3.0"` |  |
+| storage.targetRevision | string | `"0.3.2"` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/kubezero/templates/cert-manager.yaml b/charts/kubezero/templates/cert-manager.yaml
index 85443a3..ddb7c68 100644
--- a/charts/kubezero/templates/cert-manager.yaml
+++ b/charts/kubezero/templates/cert-manager.yaml
@@ -2,8 +2,12 @@
 
 localCA:
   enabled: true
-{{ with index .Values "cert-manager" "IamArn" }}
+
 cert-manager:
+  prometheus:
+    servicemonitor:
+      enabled: {{ $.Values.metrics.enabled }}
+{{ with index .Values "cert-manager" "IamArn" }}
   extraEnv:
   - name: AWS_ROLE_ARN
     value: "{{ . }}"
@@ -25,10 +29,6 @@ cert-manager:
   - name: aws-token
     mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/"
     readOnly: true
-
-  prometheus:
-    servicemonitor:
-      enabled: {{ $.Values.metrics.enabled }}
 {{- end }}
 
 {{- with index .Values "cert-manager" "clusterIssuer" }}
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index a64a69f..4060ba7 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -64,7 +64,7 @@ logging:
   enabled: false
   crds: true
   namespace: logging
-  targetRevision: 0.7.13
+  targetRevision: 0.7.14
 
 argocd:
   enabled: false