add: additional rhoai ns

redhat-na-ssa · Nov 8, 2024 · ba2fcc2 · ba2fcc2
1 parent e792f2a
commit ba2fcc2
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 19 deletions.
diff --git a/components/operators/rhods-operator/instance/base/namespace.yaml b/components/operators/rhods-operator/instance/base/namespace.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -7,21 +6,3 @@ metadata:
   labels:
     openshift.io/cluster-monitoring: 'true'
   name: redhat-ods-applications
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    openshift.io/display-name: "OpenShift AI - Monitoring"
-  labels:
-    openshift.io/cluster-monitoring: 'true'
-  name: redhat-ods-monitoring
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    openshift.io/display-name: "OpenShift AI - Individual Notebooks"
-  labels:
-    openshift.io/cluster-monitoring: 'true'
-  name: rhods-notebooks
diff --git a/...nts/operators/rhods-operator/instance/components/additional-namespaces/kustomization.yaml b/...nts/operators/rhods-operator/instance/components/additional-namespaces/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - namespace.yaml
diff --git a/components/operators/rhods-operator/instance/components/additional-namespaces/namespace.yaml b/components/operators/rhods-operator/instance/components/additional-namespaces/namespace.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    openshift.io/display-name: "OpenShift AI - Monitoring"
+  labels:
+    openshift.io/cluster-monitoring: 'true'
+  name: redhat-ods-monitoring
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    openshift.io/display-name: "OpenShift AI - Individual Notebooks"
+  labels:
+    openshift.io/cluster-monitoring: 'true'
+  name: rhods-notebooks
diff --git a/components/operators/rhods-operator/instance/overlays/all/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/all/kustomization.yaml
@@ -5,6 +5,7 @@ resources:
   - ../../base
 
 components:
+  - ../../components/additional-namespaces
   - ../../components/auth-with-authorino
   - ../../components/components-distributed-compute
   - ../../components/components-serving

diff --git a/...onents/operators/rhods-operator/instance/overlays/eus-2.8-serving-only/kustomization.yaml b/...onents/operators/rhods-operator/instance/overlays/eus-2.8-serving-only/kustomization.yaml
@@ -1,6 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+namespace: redhat-ods-applications
+
 resources:
   - ../../base
 

diff --git a/...nents/operators/rhods-operator/instance/overlays/eus-2.8-training-only/kustomization.yaml b/...nents/operators/rhods-operator/instance/overlays/eus-2.8-training-only/kustomization.yaml
@@ -1,6 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+namespace: redhat-ods-applications
+
 resources:
   - ../../base
 

diff --git a/components/operators/rhods-operator/instance/overlays/minimal/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/minimal/kustomization.yaml
@@ -5,6 +5,7 @@ resources:
   - ../../base
 
 components:
+  - ../../components/additional-namespaces
   - ../../components/config-access-everyone
   - ../../components/disable-telemetry
   - ../../components/fix-kubeadmin-cluster-admin
diff --git a/components/operators/rhods-operator/instance/overlays/workshop/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/workshop/kustomization.yaml
@@ -5,6 +5,7 @@ resources:
   - ../../base
 
 components:
+  - ../../components/additional-namespaces
   - ../../components/auth-with-authorino
   - ../../components/components-distributed-compute
   - ../../components/components-serving