refactor: include multitenancy profile in platform profile (#295)

pperycz · web-flow · commit c4eb86027fc0 · 2025-05-14T14:05:11.000Z
diff --git a/e2e-tests/config/expected/clusters/dev-coder-minimal.yaml b/e2e-tests/config/expected/clusters/dev-coder-minimal.yaml
@@ -7,7 +7,6 @@ root:
   useLocalValues: false
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
     - orch-configs/profiles/enable-app-orch.yaml
     - orch-configs/profiles/enable-cluster-orch.yaml
     - orch-configs/profiles/enable-edgeinfra.yaml
diff --git a/e2e-tests/config/expected/clusters/dev-coder.yaml b/e2e-tests/config/expected/clusters/dev-coder.yaml
@@ -7,7 +7,6 @@ root:
   useLocalValues: false
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
     - orch-configs/profiles/enable-o11y.yaml
     - orch-configs/profiles/enable-kyverno.yaml
     - orch-configs/profiles/enable-app-orch.yaml
diff --git a/installer/cluster.tpl b/installer/cluster.tpl
@@ -7,7 +7,6 @@ root:
   useLocalValues: true
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
     - orch-configs/profiles/enable-o11y.yaml
     - orch-configs/profiles/enable-kyverno.yaml
     - orch-configs/profiles/enable-app-orch.yaml
diff --git a/orch-configs/clusters/bkc.yaml b/orch-configs/clusters/bkc.yaml
@@ -9,7 +9,6 @@ root:
   useLocalValues: true
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
     - orch-configs/profiles/enable-o11y.yaml
     - orch-configs/profiles/enable-kyverno.yaml
     - orch-configs/profiles/enable-app-orch.yaml
diff --git a/orch-configs/clusters/dev-minimal.yaml b/orch-configs/clusters/dev-minimal.yaml
@@ -7,7 +7,6 @@ root:
   useLocalValues: false
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
     - orch-configs/profiles/enable-app-orch.yaml
     - orch-configs/profiles/enable-cluster-orch.yaml
     - orch-configs/profiles/enable-edgeinfra.yaml
diff --git a/orch-configs/clusters/dev.yaml b/orch-configs/clusters/dev.yaml
@@ -7,7 +7,6 @@ root:
   useLocalValues: false
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
     - orch-configs/profiles/enable-o11y.yaml
     - orch-configs/profiles/enable-audit.yaml
     - orch-configs/profiles/enable-kyverno.yaml
diff --git a/orch-configs/clusters/onprem-1k.yaml b/orch-configs/clusters/onprem-1k.yaml
@@ -7,7 +7,6 @@ root:
   useLocalValues: false
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
     - orch-configs/profiles/enable-o11y.yaml
     - orch-configs/profiles/enable-kyverno.yaml
     - orch-configs/profiles/enable-app-orch.yaml
diff --git a/orch-configs/clusters/onprem-explicit-proxy.yaml b/orch-configs/clusters/onprem-explicit-proxy.yaml
@@ -7,7 +7,6 @@ root:
   useLocalValues: false
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
     - orch-configs/profiles/enable-o11y.yaml
     - orch-configs/profiles/enable-kyverno.yaml
     - orch-configs/profiles/enable-app-orch.yaml
diff --git a/orch-configs/clusters/onprem.yaml b/orch-configs/clusters/onprem.yaml
@@ -7,7 +7,6 @@ root:
   useLocalValues: false
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
     - orch-configs/profiles/enable-o11y.yaml
     - orch-configs/profiles/enable-kyverno.yaml
     - orch-configs/profiles/enable-app-orch.yaml
diff --git a/orch-configs/profiles/enable-multitenancy.yaml b/orch-configs/profiles/enable-multitenancy.yaml
diff --git a/orch-configs/profiles/enable-platform.yaml b/orch-configs/profiles/enable-platform.yaml
@@ -25,6 +25,7 @@ argo:
     istiod: true
     kiali: true
     metadata-broker: true
+    multitenant_gateway: true
     nginx-ingress-pxe-boots: true
     platform-autocert: true
     platform-keycloak: true
diff --git a/orch-configs/templates/cluster.tpl b/orch-configs/templates/cluster.tpl
@@ -7,7 +7,6 @@ root:
   useLocalValues: false
   clusterValues:
     - orch-configs/profiles/enable-platform.yaml
-    - orch-configs/profiles/enable-multitenancy.yaml
 {{- if .Values.enableObservability }}
     - orch-configs/profiles/enable-o11y.yaml
 {{- end }}
@@ -129,7 +128,7 @@ orchestratorDeployment:
   enableMailpit: {{ .Values.enableMailpit }}
   argoServiceType: {{ .Values.argoServiceType }}
   dockerCache: "{{ .Values.dockerCache }}"
-{{- if and .Values.dockerCacheCert }}  
+{{- if and .Values.dockerCacheCert }}
   dockerCacheCert: |
 {{ .Values.dockerCacheCert | indent 4 }}
 {{- end }}
