helm: fix istio namespace names

Signed-off-by: danish9039 <danishsiddiqui040@gmail.com>

Author: danish9039

experimental/helm/charts/istio/README.md

@@ -50,6 +50,10 @@ Helm release metadata and Istio workloads are stored in `istio-system`. The
 `kubeflow-namespaces` foundation chart creates `Namespace/istio-system` first.
 Istio CNI resources still run in `kube-system`.
 
+## Namespace names
+
+Namespace names are fixed to match the Kustomize baseline and `kubeflow-namespaces` foundation chart. Istio workloads use `istio-system`, Istio CNI resources use `kube-system`, and Kubeflow gateway resources refer to `kubeflow`. These names are not configurable.
+
 ## Kustomize Mapping
 
 - `ci/values-crds.yaml`: `common/istio/istio-crds/base`

experimental/helm/charts/istio/templates/_helpers.tpl

@@ -2,21 +2,9 @@
 Render a static Kustomize-generated manifest file while preserving the Go
 templates embedded in Istio injector ConfigMaps.
 */}}
-{{- define "kubeflow-istio.validateNamespace" -}}
-{{- $name := .name -}}
-{{- $value := .value | toString -}}
-{{- if or (gt (len $value) 63) (not (regexMatch "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" $value)) -}}
-{{- fail (printf "%s must be a valid DNS-1123 label, got %q" $name $value) -}}
-{{- end -}}
-{{- end -}}
-
 {{- define "kubeflow-istio.renderFile" -}}
 {{- $root := .root -}}
 {{- $content := $root.Files.Get .path -}}
-{{- $content = replace "istio-system" ($root.Values.global.istioNamespace | toString) $content -}}
-{{- $content = replace "kube-system" ($root.Values.global.kubeSystemNamespace | toString) $content -}}
-{{- $content = regexReplaceAll "(?m)^([[:space:]]*namespace: )kubeflow$" $content (printf "${1}%s" ($root.Values.global.kubeflowNamespace | toString)) -}}
-{{- $content = replace "- kubeflow/*" (printf "- %s/*" ($root.Values.global.kubeflowNamespace | toString)) $content -}}
 {{- if .oauth2ProxyService -}}
 {{- $content = replace "service: oauth2-proxy.oauth2-proxy.svc.cluster.local" (printf "service: %s" ($root.Values.oauth2Proxy.service | toString)) $content -}}
 {{- $content = regexReplaceAll "(service: [^\\n]+\\n[[:space:]]*port: )[0-9]+(\\n[[:space:]]*name: oauth2-proxy)" $content (printf "${1}%d${2}" (int $root.Values.oauth2Proxy.port)) -}}

experimental/helm/charts/istio/templates/profile-validation.yaml

@@ -1,6 +1,3 @@
-{{- include "kubeflow-istio.validateNamespace" (dict "name" "global.istioNamespace" "value" .Values.global.istioNamespace) -}}
-{{- include "kubeflow-istio.validateNamespace" (dict "name" "global.kubeflowNamespace" "value" .Values.global.kubeflowNamespace) -}}
-{{- include "kubeflow-istio.validateNamespace" (dict "name" "global.kubeSystemNamespace" "value" .Values.global.kubeSystemNamespace) -}}
 {{- $validProfiles := list "base" "oauth2-proxy" "gke" -}}
 {{- if not (has .Values.profile $validProfiles) -}}
 {{- fail (printf "unsupported istio profile %q; supported values are: base, oauth2-proxy, gke" .Values.profile) -}}

experimental/helm/charts/istio/values.yaml

@@ -7,14 +7,6 @@
 # -- Istio install profile used when install.enabled=true. Supported values: base, oauth2-proxy, gke.
 profile: oauth2-proxy
 
-global:
-  # -- Namespace for Istio control-plane workloads.
-  istioNamespace: istio-system
-  # -- Namespace for Kubeflow resources referenced by Istio Sidecar resources.
-  kubeflowNamespace: kubeflow
-  # -- Namespace for Istio CNI resources.
-  kubeSystemNamespace: kube-system
-
 crds:
   # -- Render Istio CustomResourceDefinition resources.
   enabled: true