MGDCTRS-1745: Enabling Label Selection feature in Camel-K (#627)

* MGDCTRS-1745: Enabling Label Selection feature in Camel-K --------- Co-authored-by: shivamgu <[email protected]>
bf2fc6cc711aee1a0c2a · Apr 5, 2023 · 47c3e84 · 47c3e84
1 parent 4d23224
commit 47c3e84
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 9 deletions.
diff --git a/etc/kubernetes/manifests/base/apps/camel-k/patches/patch-camel-k-deployment.yaml b/etc/kubernetes/manifests/base/apps/camel-k/patches/patch-camel-k-deployment.yaml
@@ -10,9 +10,7 @@ spec:
           env:
           - name: WATCH_NAMESPACE            
             valueFrom:
-              $patch: delete            
-          #- name: KAMEL_OPERATOR_ID            
-          #  value: "cos-fleetshard-operator-camel"
+              $patch: delete
           - name: KAMEL_INSTALL_DEFAULT_KAMELETS
             value: "false"
           - name: LOG_LEVEL
@@ -21,6 +19,8 @@ spec:
                 name: camel-k-override-config
                 key: log.level
                 optional: true
+          - name: OPERATOR_ID
+            value: "cos-fleetshard-operator-camel"
           resources:
             limits:
               cpu: "1000m"

diff --git a/...netes/manifests/base/apps/cos-fleetshard-operator-camel/app-config/application.properties b/...netes/manifests/base/apps/cos-fleetshard-operator-camel/app-config/application.properties
@@ -5,5 +5,5 @@ quarkus.log.category."org.bf2.cos.fleetshard.sync".level = DEBUG
 quarkus.log.category."org.bf2.cos.fleetshard.client".level = DEBUG
 quarkus.log.category."io.fabric8.kubernetes.client.internal.VersionUsageUtils".level = ERROR
 
-cos.operator.camel.label-selection.enabled = false
+cos.operator.camel.label-selection.enabled = true
 # cos.image_pull_secrets_name =
diff --git a/etc/kubernetes/manifests/overlays/dev/camel-k/integration-platform.yaml b/etc/kubernetes/manifests/overlays/dev/camel-k/integration-platform.yaml
@@ -1,4 +1,6 @@
 apiVersion: camel.apache.org/v1
 kind: IntegrationPlatform
 metadata:
-  name: camel-k
+  name: cos-fleetshard-operator-camel
+  annotations:
+    camel.apache.org/operator.id: "cos-fleetshard-operator-camel"
diff --git a/etc/kubernetes/manifests/overlays/e2e/kustomization.yaml b/etc/kubernetes/manifests/overlays/e2e/kustomization.yaml
@@ -10,7 +10,7 @@ patchesStrategicMerge:
     apiVersion: camel.apache.org/v1
     kind: IntegrationPlatform
     metadata:
-      name: camel-k
+      name: cos-fleetshard-operator-camel
 
 patches:
   #

diff --git a/etc/kubernetes/manifests/overlays/local/camel-k/integration-platform.yaml b/etc/kubernetes/manifests/overlays/local/camel-k/integration-platform.yaml
@@ -1,4 +1,6 @@
 apiVersion: camel.apache.org/v1
 kind: IntegrationPlatform
 metadata:
-  name: camel-k
+  name: cos-fleetshard-operator-camel
+  annotations:
+    camel.apache.org/operator.id: "cos-fleetshard-operator-camel"
diff --git a/etc/kubernetes/manifests/overlays/staging/camel-k/integration-platform.yaml b/etc/kubernetes/manifests/overlays/staging/camel-k/integration-platform.yaml
@@ -1,4 +1,6 @@
 apiVersion: camel.apache.org/v1
 kind: IntegrationPlatform
 metadata:
-  name: camel-k
+  name: cos-fleetshard-operator-camel
+  annotations:
+    camel.apache.org/operator.id: "cos-fleetshard-operator-camel"
diff --git a/...anifests/overlays/staging/cos-fleetshard-operator-camel/app-config/application.properties b/...anifests/overlays/staging/cos-fleetshard-operator-camel/app-config/application.properties
@@ -5,4 +5,4 @@ quarkus.log.category."org.bf2.cos.fleetshard".level = INFO
 quarkus.log.category."io.fabric8.kubernetes.client.internal.VersionUsageUtils".level = ERROR
 
 # our properties
-cos.operator.camel.label-selection.enabled = false
+cos.operator.camel.label-selection.enabled = true