From 5ae30e452c771ab12ccc42167581c8a7fccb7cce Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Sun, 22 Jan 2023 16:28:23 +0000
Subject: [PATCH] chore: merge 1.24 values to resolve conflicts

---
 charts/kubezero/values.yaml | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index e721a981..6c39133b 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -10,48 +10,58 @@ global:
 
 addons:
   enabled: true
-  targetRevision: 0.6.3
+  targetRevision: 0.7.3
   external-dns:
     enabled: false
   forseti:
     enabled: false
   clusterBackup:
     enabled: false
+  cluster-autoscaler:
+    enabled: false
+  sealed-secrets:
+    enabled: false
   aws-node-termination-handler:
     enabled: false
-  cluster-autoscaler:
+  aws-eks-asg-rolling-update-handler:
     enabled: false
 
 network:
   enabled: true
   retain: true
-  targetRevision: 0.3.4
+  targetRevision: 0.4.2
   cilium:
     cluster: {}
 
 cert-manager:
   enabled: false
   namespace: cert-manager
-  targetRevision: 0.9.2
+  targetRevision: 0.9.3
 
 storage:
   enabled: false
-  targetRevision: 0.7.2
+  targetRevision: 0.7.4
   aws-ebs-csi-driver:
     enabled: false
   aws-efs-csi-driver:
     enabled: false
+  velero:
+    enabled: false
+  gemini:
+    enabled: false
+  snapshotController:
+    enabled: false
 
 istio:
   enabled: false
   namespace: istio-system
-  targetRevision: 0.8.4
+  targetRevision: 0.9.0
 
 istio-ingress:
   enabled: false
   chart: kubezero-istio-gateway
   namespace: istio-ingress
-  targetRevision: 0.8.2
+  targetRevision: 0.9.0
   gateway:
     service: {}
 
@@ -59,14 +69,14 @@ istio-private-ingress:
   enabled: false
   chart: kubezero-istio-gateway
   namespace: istio-ingress
-  targetRevision: 0.8.2
+  targetRevision: 0.9.0
   gateway:
     service: {}
 
 metrics:
   enabled: false
   namespace: monitoring
-  targetRevision: 0.8.5
+  targetRevision: 0.8.9
   istio:
     grafana: {}
     prometheus: {}
@@ -74,11 +84,13 @@ metrics:
 logging:
   enabled: false
   namespace: logging
-  targetRevision: 0.8.3
+  targetRevision: 0.8.4
 
 argocd:
   enabled: false
   namespace: argocd
-  targetRevision: 0.10.2
+  targetRevision: 0.11.2
+  argocd-image-updater:
+    enabled: false
   istio:
     enabled: false