remove istio_component_namespaces

fixes: kiali#4109
jmazzitelli · Jun 17, 2021 · 538efb4 · 538efb4
1 parent 9ff1a3b
commit 538efb4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 27 deletions.
diff --git a/config/config.go b/config/config.go
@@ -310,10 +310,6 @@ type DeploymentConfig struct {
 	Namespace            string   `yaml:"namespace,omitempty"` // Kiali deployment namespace
 }
 
-// IstioComponentNamespaces holds the component-specific Istio namespaces. Any missing component
-// defaults to the namespace configured for IstioNamespace (which itself defaults to 'istio-system').
-type IstioComponentNamespaces map[string]string
-
 // GraphFindOption defines a single Graph Find/Hide Option
 type GraphFindOption struct {
 	Description string `yaml:"description,omitempty" json:"description,omitempty"`
@@ -375,7 +371,6 @@ type Config struct {
 	Identity                 security.Identity                   `yaml:",omitempty"`
 	InCluster                bool                                `yaml:"in_cluster,omitempty"`
 	InstallationTag          string                              `yaml:"installation_tag,omitempty"`
-	IstioComponentNamespaces IstioComponentNamespaces            `yaml:"istio_component_namespaces,omitempty"`
 	IstioLabels              IstioLabels                         `yaml:"istio_labels,omitempty"`
 	IstioNamespace           string                              `yaml:"istio_namespace,omitempty"` // default component namespace
 	KialiFeatureFlags        KialiFeatureFlags                   `yaml:"kiali_feature_flags,omitempty"`
@@ -780,15 +775,10 @@ func SaveToFile(filename string, conf *Config) (err error) {
 	return
 }
 
-// IsIstioNamespace returns true if the namespace is the default istio namespace or an Istio component namespace
+// IsIstioNamespace returns true if the namespace is the default istio namespace
 func IsIstioNamespace(namespace string) bool {
 	if namespace == configuration.IstioNamespace {
 		return true
 	}
-	for _, ns := range configuration.IstioComponentNamespaces {
-		if ns == namespace {
-			return true
-		}
-	}
 	return false
 }
diff --git a/graph/api/api_test.go b/graph/api/api_test.go
@@ -86,7 +86,6 @@ func setupMocked() (*prometheus.Client, *prometheustest.PromAPIMock, *kubetest.K
 func setupMockedWithIstioComponentNamespaces() (*prometheus.Client, *prometheustest.PromAPIMock, *kubetest.K8SClientMock, error) {
 	testConfig := config.NewConfig()
 	testConfig.KubernetesConfig.CacheEnabled = false
-	testConfig.IstioComponentNamespaces = config.IstioComponentNamespaces{"telemetry": "istio-telemetry"}
 	config.Set(testConfig)
 	k8s := new(kubetest.K8SClientMock)
 

diff --git a/handlers/config.go b/handlers/config.go
@@ -46,20 +46,19 @@ type PrometheusConfig struct {
 // PublicConfig is a subset of Kiali configuration that can be exposed to clients to
 // help them interact with the system.
 type PublicConfig struct {
-	ClusterInfo              ClusterInfo                     `json:"clusterInfo,omitempty"`
-	Clusters                 map[string]business.Cluster     `json:"clusters,omitempty"`
-	Extensions               Extensions                      `json:"extensions,omitempty"`
-	HealthConfig             config.HealthConfig             `json:"healthConfig,omitempty"`
-	InstallationTag          string                          `json:"installationTag,omitempty"`
-	IstioAnnotations         IstioAnnotations                `json:"istioAnnotations,omitempty"`
-	IstioStatusEnabled       bool                            `json:"istioStatusEnabled,omitempty"`
-	IstioIdentityDomain      string                          `json:"istioIdentityDomain,omitempty"`
-	IstioNamespace           string                          `json:"istioNamespace,omitempty"`
-	IstioComponentNamespaces config.IstioComponentNamespaces `json:"istioComponentNamespaces,omitempty"`
-	IstioLabels              config.IstioLabels              `json:"istioLabels,omitempty"`
-	IstioConfigMap           string                          `json:"istioConfigMap"`
-	KialiFeatureFlags        config.KialiFeatureFlags        `json:"kialiFeatureFlags,omitempty"`
-	Prometheus               PrometheusConfig                `json:"prometheus,omitempty"`
+	ClusterInfo              ClusterInfo                 `json:"clusterInfo,omitempty"`
+	Clusters                 map[string]business.Cluster `json:"clusters,omitempty"`
+	Extensions               Extensions                  `json:"extensions,omitempty"`
+	HealthConfig             config.HealthConfig         `json:"healthConfig,omitempty"`
+	InstallationTag          string                      `json:"installationTag,omitempty"`
+	IstioAnnotations         IstioAnnotations            `json:"istioAnnotations,omitempty"`
+	IstioStatusEnabled       bool                        `json:"istioStatusEnabled,omitempty"`
+	IstioIdentityDomain      string                      `json:"istioIdentityDomain,omitempty"`
+	IstioNamespace           string                      `json:"istioNamespace,omitempty"`
+	IstioLabels              config.IstioLabels          `json:"istioLabels,omitempty"`
+	IstioConfigMap           string                      `json:"istioConfigMap"`
+	KialiFeatureFlags        config.KialiFeatureFlags    `json:"kialiFeatureFlags,omitempty"`
+	Prometheus               PrometheusConfig            `json:"prometheus,omitempty"`
 }
 
 // Config is a REST http.HandlerFunc serving up the Kiali configuration made public to clients.
@@ -86,7 +85,6 @@ func Config(w http.ResponseWriter, r *http.Request) {
 		IstioStatusEnabled:       config.ExternalServices.Istio.ComponentStatuses.Enabled,
 		IstioIdentityDomain:      config.ExternalServices.Istio.IstioIdentityDomain,
 		IstioNamespace:           config.IstioNamespace,
-		IstioComponentNamespaces: config.IstioComponentNamespaces,
 		IstioLabels:              config.IstioLabels,
 		IstioConfigMap:           config.ExternalServices.Istio.ConfigMapName,
 		KialiFeatureFlags:        config.KialiFeatureFlags,