Allow modifying namespace from web console (#301)

Signed-off-by: msherif1234 <[email protected]>
netobserv · Mar 27, 2023 · 3130154 · 3130154
1 parent ed852f2
commit 3130154
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/bundle/manifests/netobserv-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml b/bundle/manifests/netobserv-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
@@ -13,7 +13,7 @@ spec:
     scheme: https
     tlsConfig:
       caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
-      serverName: netobserv-metrics-service.openshift-operators.svc
+      serverName: netobserv-metrics-service.openshift-netobserv-operator.svc
   selector:
     matchLabels:
       control-plane: controller-manager
diff --git a/bundle/manifests/netobserv-operator.clusterserviceversion.yaml b/bundle/manifests/netobserv-operator.clusterserviceversion.yaml
@@ -337,6 +337,7 @@ metadata:
     containerImage: quay.io/netobserv/network-observability-operator:1.0.2
     createdAt: ':created-at:'
     description: Network flows collector and monitoring solution
+    operatorframework.io/suggested-namespace: openshift-netobserv-operator
     operators.operatorframework.io/builder: operator-sdk-v1.25.3
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/netobserv/network-observability-operator

diff --git a/config/manifests/bases/netobserv-operator.clusterserviceversion.yaml b/config/manifests/bases/netobserv-operator.clusterserviceversion.yaml
@@ -9,6 +9,7 @@ metadata:
     containerImage: ':container-image:'
     createdAt: ':created-at:'
     description: Network flows collector and monitoring solution
+    operatorframework.io/suggested-namespace: openshift-netobserv-operator
     repository: https://github.com/netobserv/network-observability-operator
   name: netobserv-operator.v0.0.0
   namespace: placeholder

diff --git a/config/openshift-olm/kustomization.yaml b/config/openshift-olm/kustomization.yaml
@@ -25,6 +25,5 @@ bases:
 - ../rbac
 - ../manager
 - ../webhook
-- namespace.yaml
 patchesStrategicMerge:
 - patch.yaml
diff --git a/config/openshift-olm/monitor.yaml b/config/openshift-olm/monitor.yaml
@@ -15,7 +15,7 @@ spec:
       scheme: https
       tlsConfig:
         caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
-        serverName: netobserv-metrics-service.openshift-operators.svc
+        serverName: netobserv-metrics-service.openshift-netobserv-operator.svc
   selector:
     matchLabels:
       control-plane: controller-manager
diff --git a/config/openshift-olm/namespace.yaml b/config/openshift-olm/namespace.yaml
diff --git a/config/openshift/monitor.yaml b/config/openshift/monitor.yaml
@@ -15,7 +15,7 @@ spec:
       scheme: https
       tlsConfig:
         caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
-        serverName: netobserv-metrics-service.netobserv.svc
+        serverName: netobserv-metrics-service.openshift-netobserv-operator.svc
   selector:
     matchLabels:
       control-plane: controller-manager
diff --git a/config/openshift/namespace.yaml b/config/openshift/namespace.yaml
@@ -1,4 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: netobserv
+  labels:
+    openshift.io/cluster-monitoring: "true"
+  name: openshift-netobserv-operator