From be1a727fe8f7efd1492ab21ab67a52505bd96383 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 22 Nov 2023 13:19:13 +0000
Subject: [PATCH] Various bugfixes

---
 admin/migrate_argo_values.py             | 5 +++--
 charts/kubezero-logging/Chart.yaml       | 2 +-
 charts/kubezero/templates/logging.yaml   | 4 ----
 charts/kubezero/templates/operators.yaml | 5 +++++
 charts/kubezero/values.yaml              | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/admin/migrate_argo_values.py b/admin/migrate_argo_values.py
index 09e3cd7..7f03e85 100755
--- a/admin/migrate_argo_values.py
+++ b/admin/migrate_argo_values.py
@@ -19,8 +19,9 @@ def migrate(values):
     try:
         if values["logging"]["eck-operator"]["enabled"]:
             if "operators" not in values:
-                values["operators"] = {}
-            values["operators"]["eck-operator"] = { "enabled": true }
+                values["operators"] = { "enabled": True }
+            values["operators"]["eck-operator"] = { "enabled": True }
+            values["logging"].pop("eck-operator", None)
     except KeyError:
         pass
 
diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml
index c2eeaf4..9ad5927 100644
--- a/charts/kubezero-logging/Chart.yaml
+++ b/charts/kubezero-logging/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-logging
 description: KubeZero Umbrella Chart for complete EFK stack
 type: application
-version: 0.8.7
+version: 0.8.8
 appVersion: 1.6.0
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
diff --git a/charts/kubezero/templates/logging.yaml b/charts/kubezero/templates/logging.yaml
index 26d26b4..9baa719 100644
--- a/charts/kubezero/templates/logging.yaml
+++ b/charts/kubezero/templates/logging.yaml
@@ -1,8 +1,4 @@
 {{- define "logging-values" }}
-{{- with index .Values "logging" "eck-operator" }}
-eck-operator:
-  {{- toYaml . | nindent 2 }}
-{{- end }}
 
 {{- if .Values.logging.elastic_password }}
 elastic_password: {{ .Values.logging.elastic_password }}
diff --git a/charts/kubezero/templates/operators.yaml b/charts/kubezero/templates/operators.yaml
index 85c64a8..70f6563 100644
--- a/charts/kubezero/templates/operators.yaml
+++ b/charts/kubezero/templates/operators.yaml
@@ -5,6 +5,11 @@ opensearch-operator:
   {{- toYaml . | nindent 2 }}
 {{- end }}
 
+{{- with index .Values "operators" "eck-operator" }}
+eck-operator:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+
 {{- end }}
 
 
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index f1a5d36..26f8d0f 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -71,7 +71,7 @@ istio-private-ingress:
   enabled: false
   chart: kubezero-istio-gateway
   namespace: istio-ingress
-  targetRevision: 0.18.2
+  targetRevision: 0.19.4
   gateway:
     service: {}
 
@@ -107,7 +107,7 @@ metrics:
 logging:
   enabled: false
   namespace: logging
-  targetRevision: 0.8.7
+  targetRevision: 0.8.8
 
 argocd:
   enabled: false