Fix #366 - Add custom label to manifests to avoid clashing with insta…

…lled operators in a cluster (#373) Signed-off-by: Ricardo Zanini <[email protected]>
apache · Feb 2, 2024 · d7c8c0b · d7c8c0b
1 parent 47c73db
commit d7c8c0b
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -71,7 +71,7 @@ jobs:
       - name: Deploy operator
         run: |
           make deploy IMG=${{ env.OPERATOR_IMAGE_NAME }}
-          kubectl wait pod -A -l control-plane=controller-manager --for condition=Ready
+          kubectl wait pod -A -l control-plane=sonataflow-operator --for condition=Ready
 
       - name: Run tests
         run: |

diff --git a/bundle.osl/manifests/logic-operator-rhel8-controller-manager-metrics-service_v1_service.yaml b/bundle.osl/manifests/logic-operator-rhel8-controller-manager-metrics-service_v1_service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
   name: logic-operator-rhel8-controller-manager-metrics-service
 spec:
   ports:
@@ -12,6 +12,6 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
 status:
   loadBalancer: {}
diff --git a/bundle.osl/manifests/logic-operator-rhel8.clusterserviceversion.yaml b/bundle.osl/manifests/logic-operator-rhel8.clusterserviceversion.yaml
@@ -510,20 +510,20 @@ spec:
           serviceAccountName: logic-operator-rhel8-controller-manager
       deployments:
         - label:
-            control-plane: controller-manager
+            control-plane: sonataflow-operator
           name: logic-operator-rhel8-controller-manager
           spec:
             replicas: 1
             selector:
               matchLabels:
-                control-plane: controller-manager
+                control-plane: sonataflow-operator
             strategy: {}
             template:
               metadata:
                 annotations:
                   kubectl.kubernetes.io/default-container: manager
                 labels:
-                  control-plane: controller-manager
+                  control-plane: sonataflow-operator
               spec:
                 containers:
                   - args:

diff --git a/bundle/manifests/sonataflow-operator-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/sonataflow-operator-controller-manager-metrics-service_v1_service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
   name: sonataflow-operator-controller-manager-metrics-service
 spec:
   ports:
@@ -12,6 +12,6 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
 status:
   loadBalancer: {}
diff --git a/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml b/bundle/manifests/sonataflow-operator.clusterserviceversion.yaml
@@ -651,20 +651,20 @@ spec:
         serviceAccountName: sonataflow-operator-controller-manager
       deployments:
       - label:
-          control-plane: controller-manager
+          control-plane: sonataflow-operator
         name: sonataflow-operator-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: controller-manager
+              control-plane: sonataflow-operator
           strategy: {}
           template:
             metadata:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
-                control-plane: controller-manager
+                control-plane: sonataflow-operator
             spec:
               containers:
               - args:

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
   name: system
 ---
 apiVersion: apps/v1
@@ -11,18 +11,18 @@ metadata:
   name: controller-manager
   namespace: system
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: sonataflow-operator
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: sonataflow-operator
     spec:
       securityContext:
         runAsNonRoot: true

diff --git a/config/manager/osl/manager.yaml b/config/manager/osl/manager.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
   name: system
 ---
 apiVersion: apps/v1
@@ -11,18 +11,18 @@ metadata:
   name: controller-manager
   namespace: system
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: sonataflow-operator
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: sonataflow-operator
     spec:
       securityContext:
         runAsNonRoot: true

diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
   name: controller-manager-metrics-monitor
   namespace: system
 spec:
@@ -17,4 +17,4 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: sonataflow-operator
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
   name: controller-manager-metrics-service
   namespace: system
 spec:
@@ -12,4 +12,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
diff --git a/operator.yaml b/operator.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
   name: sonataflow-operator-system
 ---
 apiVersion: apiextensions.k8s.io/v1
@@ -26735,7 +26735,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
   name: sonataflow-operator-controller-manager-metrics-service
   namespace: sonataflow-operator-system
 spec:
@@ -26745,26 +26745,26 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    control-plane: controller-manager
+    control-plane: sonataflow-operator
   name: sonataflow-operator-controller-manager
   namespace: sonataflow-operator-system
 spec:
   replicas: 1
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: sonataflow-operator
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: sonataflow-operator
     spec:
       containers:
       - args:

diff --git a/testbdd/steps/operator.go b/testbdd/steps/operator.go
@@ -53,7 +53,7 @@ func (data *Data) sonataFlowOperatorIsDeployed() (err error) {
 }
 
 //func (data *Data) sonataFlowOperatorHasPodsRunning(numberOfPods int, name, phase string) error {
-//	return framework.WaitForPodsWithLabel(data.Namespace, "control-plane", "controller-manager", numberOfPods, 1)
+//	return framework.WaitForPodsWithLabel(data.Namespace, "control-plane", "sonataflow-operator", numberOfPods, 1)
 //}
 //
 //func (data *Data) kogitoOperatorShouldBeInstalled() error {