Skip to content

Commit 3bdd6d2

Browse files
Fix #6652: Default global operator to camel namespace
1 parent 84d02ca commit 3bdd6d2

24 files changed

Lines changed: 78 additions & 65 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ runs:
3939
# --docker-server $KAMEL_INSTALL_REGISTRY \
4040
# --docker-username admin \
4141
# --docker-password password \
42-
# -n camel-k
42+
# -n camel
4343
4444
kubectl create configmap camel-k-operator-configmap-configuration \
4545
--from-literal=REGISTRY_ADDRESS="$DEV_REGISTRY" \
46-
-n camel-k
46+
-n camel
4747
# Uncomment to provide a push secret
4848
# --from-literal=REGISTRY_SECRET="my-registry"
49-
49+

‎.github/workflows/arkmq.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ jobs:
7575
- name: Install operator
7676
shell: bash
7777
run: |
78-
kubectl create ns camel-k
78+
kubectl create ns camel
7979
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
80-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
80+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
8181
8282
- name: Run test
8383
shell: bash

‎.github/workflows/cert-manager.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ jobs:
7575
- name: Install operator
7676
shell: bash
7777
run: |
78-
kubectl create ns camel-k
78+
kubectl create ns camel
7979
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
80-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
80+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
8181
8282
- name: Run test
8383
shell: bash

‎.github/workflows/common.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,22 +73,22 @@ jobs:
7373
- name: Install operator
7474
shell: bash
7575
run: |
76-
kubectl create ns camel-k
76+
kubectl create ns camel
7777
# the extra configuration is required to run the container registry with secret
7878
kubectl create configmap camel-k-operator-configmap-configuration \
7979
--from-literal=ENABLE_DEV_REGISTRY_SECRET="true" \
8080
--from-literal=MAVEN_REPOSITORIES_ALLOWED="https://maven.repository.redhat.com/ga@id=redhat" \
81-
-n camel-k
81+
-n camel
8282
# make the test aware that each Integration requires a pull secret
8383
E2E_TEST_REGISTRY_SECRET_COPY=true
8484
echo "E2E_TEST_REGISTRY_SECRET_COPY=$E2E_TEST_REGISTRY_SECRET_COPY" >> $GITHUB_ENV
8585
echo "Setting E2E_TEST_REGISTRY_SECRET_COPY=true in order to automate the copy of the pull secret and the setting in each test"
8686
8787
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
88-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
88+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
8989
# Install Apache Kamelets catalog
9090
mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.22.0:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
91-
unzip /tmp/camel-kamelets-4.22.0.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
91+
unzip /tmp/camel-kamelets-4.22.0.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
9292
9393
- name: Run test
9494
shell: bash

‎.github/workflows/gateway.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ jobs:
7575
- name: Install operator
7676
shell: bash
7777
run: |
78-
kubectl create ns camel-k
78+
kubectl create ns camel
7979
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
80-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
80+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
8181
8282
- name: Run test
8383
shell: bash

‎.github/workflows/kafka.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ jobs:
7575
- name: Install operator
7676
shell: bash
7777
run: |
78-
kubectl create ns camel-k
78+
kubectl create ns camel
7979
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
80-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
80+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
8181
8282
- name: Run test
8383
shell: bash

‎.github/workflows/knative.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ jobs:
7575
- name: Install operator
7676
shell: bash
7777
run: |
78-
kubectl create ns camel-k
78+
kubectl create ns camel
7979
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
80-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
80+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
8181
# Install Apache Kamelets catalog
8282
mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.18.1:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
83-
unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
83+
unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
8484
8585
- name: Run test
8686
shell: bash

‎.github/workflows/native.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ jobs:
7676
- name: Install operator
7777
shell: bash
7878
run: |
79-
kubectl create ns camel-k
79+
kubectl create ns camel
8080
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
81-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
81+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
8282
# Install Apache Kamelets catalog
8383
mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.18.1:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
84-
unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
84+
unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
8585
8686
- name: Run test
8787
shell: bash

‎.github/workflows/network-policy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ jobs:
7272
- name: Install operator
7373
shell: bash
7474
run: |
75-
kubectl create ns camel-k
75+
kubectl create ns camel
7676
kubectl create configmap camel-k-operator-configmap-configuration \
7777
--from-literal=MAVEN_REPOSITORIES_ALLOWED="https://maven.repository.redhat.com/ga@id=redhat" \
78-
-n camel-k
78+
-n camel
7979
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
80-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
80+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
8181
8282
- name: Run NetworkPolicy E2E test
8383
shell: bash

‎.github/workflows/nightly-multi.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ jobs:
5858
THIS_VERSION="$(make get-version)"
5959
VERSION="$(make get-version | sed s/-SNAPSHOT//)-nightly"
6060
sed -i "s#apache/camel-k:$THIS_VERSION#testcamelk/camel-k:$VERSION#g" install/base/config/manager/operator-deployment.yaml
61-
kubectl create ns camel-k
61+
kubectl create ns camel
6262
kubectl create configmap camel-k-operator-configmap-configuration \
6363
--from-literal=MAVEN_REPOSITORIES_ALLOWED="https://maven.repository.redhat.com/ga@id=redhat" \
64-
-n camel-k
64+
-n camel
6565
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
66-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
66+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
6767
# Install Apache Kamelets catalog
6868
mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.18.1:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
69-
unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
69+
unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
7070
7171
- name: Run test
7272
shell: bash
@@ -98,15 +98,15 @@ jobs:
9898
run: |
9999
VERSION="$(make get-version | sed s/-SNAPSHOT//)-nightly-21-jdk"
100100
CUSTOM_IMAGE=testcamelk/camel-k CUSTOM_VERSION=$VERSION make bundle
101-
kubectl create ns camel-k
101+
kubectl create ns camel
102102
kubectl create configmap camel-k-operator-configmap-configuration \
103103
--from-literal=MAVEN_REPOSITORIES_ALLOWED="https://maven.repository.redhat.com/ga@id=redhat" \
104-
-n camel-k
104+
-n camel
105105
kubectl apply -k install/overlays/all-namespaces/ --server-side --force-conflicts
106-
kubectl wait --for=condition=available deployment/camel-k-operator -n camel-k --timeout=60s
106+
kubectl wait --for=condition=available deployment/camel-k-operator -n camel --timeout=60s
107107
# Install Apache Kamelets catalog
108108
mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.18.1:jar -Dmdep.useBaseVersion=true -DoutputDirectory=/tmp
109-
unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel-k
109+
unzip /tmp/camel-kamelets-4.18.1.jar -d /tmp && kubectl apply -f /tmp/kamelets -n camel
110110
111111
- name: Run test
112112
shell: bash

0 commit comments

Comments
 (0)