Fix #6652: Default global operator to camel namespace

Author: Thundercloud12

.github/actions/registry-setting/action.yml

@@ -39,11 +39,18 @@ runs:
       #   --docker-server $KAMEL_INSTALL_REGISTRY \
       #   --docker-username admin \
       #   --docker-password password \
-      #   -n camel-k
+      #   -n camel
 
+      kubectl create ns camel --dry-run=client -o yaml | kubectl apply -f -
       kubectl create configmap camel-k-operator-configmap-configuration \
         --from-literal=REGISTRY_ADDRESS="$DEV_REGISTRY" \
-        -n camel-k
+        -n camel
+      # Also configure camel-k namespace if present (used in upgrade tests from previous releases)
+      if kubectl get ns camel-k >/dev/null 2>&1; then
+        kubectl create configmap camel-k-operator-configmap-configuration \
+          --from-literal=REGISTRY_ADDRESS="$DEV_REGISTRY" \
+          -n camel-k
+      fi
       # Uncomment to provide a push secret
       #  --from-literal=REGISTRY_SECRET="my-registry"
-        
+

.github/workflows/cert-manager.yml

@@ -75,9 +75,9 @@ jobs:
     - name: Install operator
       shell: bash
       run: |
-        kubectl create ns camel-k
+        kubectl create ns camel
         kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
-        kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
+        kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
 
     - name: Run test
       shell: bash

.github/workflows/common.yml

@@ -73,22 +73,22 @@ jobs:
     - name: Install operator
       shell: bash
       run: |
-        kubectl create ns camel-k
+        kubectl create ns camel
         # the extra configuration is required to run the container registry with secret
         kubectl create configmap camel-k-operator-configmap-configuration \
           --from-literal=ENABLE_DEV_REGISTRY_SECRET="true" \
           --from-literal=MAVEN_REPOSITORIES_ALLOWED="https://maven.repository.redhat.com/ga@id=redhat" \
-          -n camel-k
+          -n camel
         # make the test aware that each Integration requires a pull secret
         E2E_TEST_REGISTRY_SECRET_COPY=true
         echo "E2E_TEST_REGISTRY_SECRET_COPY=$E2E_TEST_REGISTRY_SECRET_COPY" >> $GITHUB_ENV
         echo "Setting E2E_TEST_REGISTRY_SECRET_COPY=true in order to automate the copy of the pull secret and the setting in each test"
 
         kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
-        kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
+        kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
         # Install Apache Kamelets catalog
         mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.22.0:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
-        unzip /tmp/camel-kamelets-4.22.0.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
+        unzip /tmp/camel-kamelets-4.22.0.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
 
     - name: Run test
       shell: bash

.github/workflows/gateway.yml

@@ -75,9 +75,9 @@ jobs:
     - name: Install operator
       shell: bash
       run: |
-        kubectl create ns camel-k
+        kubectl create ns camel
         kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
-        kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
+        kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
 
     - name: Run test
       shell: bash

.github/workflows/kafka.yml

@@ -75,9 +75,9 @@ jobs:
     - name: Install operator
       shell: bash
       run: |
-        kubectl create ns camel-k
+        kubectl create ns camel
         kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
-        kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
+        kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
 
     - name: Run test
       shell: bash

.github/workflows/knative.yml

@@ -75,12 +75,12 @@ jobs:
     - name: Install operator
       shell: bash
       run: |
-        kubectl create ns camel-k
+        kubectl create ns camel
         kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
-        kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
+        kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
         # Install Apache Kamelets catalog
         mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.18.1:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
-        unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
+        unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
 
     - name: Run test
       shell: bash

.github/workflows/native.yml

@@ -76,12 +76,12 @@ jobs:
     - name: Install operator
       shell: bash
       run: |
-        kubectl create ns camel-k
+        kubectl create ns camel
         kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
-        kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
+        kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
         # Install Apache Kamelets catalog
         mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.18.1:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
-        unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
+        unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
 
     - name: Run test
       shell: bash

.github/workflows/nightly-multi.yml

@@ -54,15 +54,15 @@ jobs:
         THIS_VERSION="$(make get-version)"
         VERSION="$(make get-version | sed s/-SNAPSHOT//)-nightly"
         sed -i "s#apache/camel-k:$THIS_VERSION#testcamelk/camel-k:$VERSION#g" install/base/config/manager/operator-deployment.yaml
-        kubectl create ns camel-k
+        kubectl create ns camel
         kubectl create configmap camel-k-operator-configmap-configuration \
           --from-literal=MAVEN_REPOSITORIES_ALLOWED="https://maven.repository.redhat.com/ga@id=redhat" \
-          -n camel-k
+          -n camel
         kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
-        kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
+        kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
         # Install Apache Kamelets catalog
         mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.18.1:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
-        unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
+        unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
 
     - name: Run test
       shell: bash
@@ -94,15 +94,15 @@ jobs:
       run: |
         VERSION="$(make get-version | sed s/-SNAPSHOT//)-nightly-21-jdk"
         CUSTOM_IMAGE=testcamelk/camel-k CUSTOM_VERSION=$VERSION make bundle
-        kubectl create ns camel-k
+        kubectl create ns camel
         kubectl create configmap camel-k-operator-configmap-configuration \
           --from-literal=MAVEN_REPOSITORIES_ALLOWED="https://maven.repository.redhat.com/ga@id=redhat" \
-          -n camel-k        
+          -n camel
         kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
-        kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
+        kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
         # Install Apache Kamelets catalog
         mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.18.1:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
-        unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
+        unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
 
     - name: Run test
       shell: bash

.github/workflows/telemetry.yml

@@ -70,9 +70,9 @@ jobs:
     - name: Install operator
       shell: bash
       run: |
-        kubectl create ns camel-k
+        kubectl create ns camel
         kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
-        kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
+        kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
 
     - name: Install OTLP Collector
       uses: ./.github/actions/install-otlp-collector

.github/workflows/upgrade.yml

@@ -71,10 +71,11 @@ jobs:
     - name: Infra setting
       uses: ./.github/actions/infra-setting
 
-    - name: Create upgrade test namespace
+    - name: Create upgrade test namespaces
       shell: bash
       run: |
         kubectl create ns camel-k
+        kubectl create ns camel
 
     - name: Registry setting
       uses: ./.github/actions/registry-setting