Add inline yaml tag

kiali · Dec 21, 2023 · dc1dfbb · dc1dfbb
1 parent 7ad5c4a
commit dc1dfbb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/config/config.go b/config/config.go
@@ -523,7 +523,7 @@ type Clustering struct {
 
 type FeatureFlagClustering struct {
 	// TODO: Deprecate this in favor of Clustering.Clusters.
-	Clustering
+	Clustering         `yaml:",inline"`
 	EnableExecProvider bool `yaml:"enable_exec_provider,omitempty" json:"enable_exec_provider"`
 }
 
@@ -1053,6 +1053,10 @@ func Unmarshal(yamlString string) (conf *Config, err error) {
 		conf.Clustering.Clusters = conf.KialiFeatureFlags.Clustering.Clusters
 	}
 
+	if conf.Clustering.KialiURLs == nil && conf.KialiFeatureFlags.Clustering.KialiURLs != nil {
+		conf.Clustering.KialiURLs = conf.KialiFeatureFlags.Clustering.KialiURLs
+	}
+
 	return
 }