From 6fdf617b0489a527d48933169dc049813379fb1c Mon Sep 17 00:00:00 2001
From: Nick Fox <nfox@redhat.com>
Date: Wed, 10 Jan 2024 14:12:25 -0500
Subject: [PATCH 1/2] Move clustering field to top level

---
 kiali-server/values.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kiali-server/values.yaml b/kiali-server/values.yaml
index 26cd58b..e4e07c3 100644
--- a/kiali-server/values.yaml
+++ b/kiali-server/values.yaml
@@ -30,6 +30,12 @@ auth:
   openshift: {}
   strategy: ""
 
+clustering:
+  autodetect_secrets:
+    enabled: true
+    label: "kiali.io/multiCluster=true"
+  clusters: []
+
 deployment:
   # This only limits what Kiali will attempt to see, but Kiali Service Account has permissions to see everything.
   # For more control over what the Kial Service Account can see, use the Kiali Operator

From fd8f7da4276b667b793a12209d4a5f2a7d120343 Mon Sep 17 00:00:00 2001
From: Nick Fox <nfox@redhat.com>
Date: Fri, 12 Jan 2024 11:09:01 -0500
Subject: [PATCH 2/2] Remove kiali_feature_flags.clustering

---
 kiali-server/templates/_helpers.tpl    | 4 ++--
 kiali-server/templates/deployment.yaml | 4 ++--
 kiali-server/values.yaml               | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/kiali-server/templates/_helpers.tpl b/kiali-server/templates/_helpers.tpl
index 67c7c01..23b4029 100644
--- a/kiali-server/templates/_helpers.tpl
+++ b/kiali-server/templates/_helpers.tpl
@@ -178,8 +178,8 @@ Returns a JSON dict whose keys are the cluster names and values are the cluster
 */}}
 {{- define "kiali-server.remote-cluster-secrets" -}}
 {{- $theDict := dict }}
-{{- if .Values.kiali_feature_flags.clustering.autodetect_secrets.enabled }}
-  {{- $secretLabelToLookFor := (regexSplit "=" .Values.kiali_feature_flags.clustering.autodetect_secrets.label 2) }}
+{{- if .Values.clustering.autodetect_secrets.enabled }}
+  {{- $secretLabelToLookFor := (regexSplit "=" .Values.clustering.autodetect_secrets.label 2) }}
   {{- $secretLabelNameToLookFor := first $secretLabelToLookFor }}
   {{- $secretLabelValueToLookFor := last $secretLabelToLookFor }}
   {{- range $i, $secret := (lookup "v1" "Secret" .Release.Namespace "").items }}
diff --git a/kiali-server/templates/deployment.yaml b/kiali-server/templates/deployment.yaml
index 0a21a72..e614333 100644
--- a/kiali-server/templates/deployment.yaml
+++ b/kiali-server/templates/deployment.yaml
@@ -131,7 +131,7 @@ spec:
         - name: {{ $key }}
           mountPath: "/kiali-remote-cluster-secrets/{{ $val }}"
         {{- end }}
-        {{- range .Values.kiali_feature_flags.clustering.clusters }}
+        {{- range .Values.clustering.clusters }}
         - name: {{ .name }}
           mountPath: "/kiali-remote-cluster-secrets/{{ .secret_name }}"
         {{- end }}
@@ -174,7 +174,7 @@ spec:
         secret:
           secretName: {{ $val }}
       {{- end }}
-      {{- range .Values.kiali_feature_flags.clustering.clusters }}
+      {{- range .Values.clustering.clusters }}
       - name: {{ .name }}
         secret:
           secretName: {{ .secret_name }}
diff --git a/kiali-server/values.yaml b/kiali-server/values.yaml
index e4e07c3..e491a9d 100644
--- a/kiali-server/values.yaml
+++ b/kiali-server/values.yaml
@@ -104,11 +104,6 @@ kiali_feature_flags:
     secrets:
     - cacerts
     - istio-ca-secret
-  clustering:
-    autodetect_secrets:
-      enabled: true
-      label: "kiali.io/multiCluster=true"
-    clusters: []
   disabled_features: []
   validations:
     ignore: ["KIA1301"]