diff --git a/components/operators/rhods-operator/instance/base/namespace.yaml b/components/operators/rhods-operator/instance/base/namespace.yaml index c0f90bc1..1b9311db 100644 --- 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/components/operators/rhods-operator/instance/components/additional-namespaces/kustomization.yaml b/components/operators/rhods-operator/instance/components/additional-namespaces/kustomization.yaml new file mode 100644 index 00000000..e1fa3359 --- /dev/null +++ b/components/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 new file mode 100644 index 00000000..d08fee94 --- /dev/null +++ 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 index 31d12b4e..12735da0 100644 --- 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/components/operators/rhods-operator/instance/overlays/eus-2.8-serving-only/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/eus-2.8-serving-only/kustomization.yaml index ac29664e..ce980a75 100644 --- a/components/operators/rhods-operator/instance/overlays/eus-2.8-serving-only/kustomization.yaml +++ b/components/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/components/operators/rhods-operator/instance/overlays/eus-2.8-training-only/kustomization.yaml b/components/operators/rhods-operator/instance/overlays/eus-2.8-training-only/kustomization.yaml index ab37a112..8d52daae 100644 --- a/components/operators/rhods-operator/instance/overlays/eus-2.8-training-only/kustomization.yaml +++ b/components/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 index 0f63ac70..434523e3 100644 --- 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 index 11875c4b..dc1281f6 100644 --- 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