Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/actions/registry-setting/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ runs:
# --docker-server $KAMEL_INSTALL_REGISTRY \
# --docker-username admin \
# --docker-password password \
# -n camel-k
# -n camel

kubectl create configmap camel-k-operator-configmap-configuration \
--from-literal=REGISTRY_ADDRESS="$DEV_REGISTRY" \
-n camel-k
-n camel
# Uncomment to provide a push secret
# --from-literal=REGISTRY_SECRET="my-registry"

4 changes: 2 additions & 2 deletions .github/workflows/arkmq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cert-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gateway.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/knative.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/network-policy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ jobs:
- name: Install operator
shell: bash
run: |
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

- name: Run NetworkPolicy E2E test
shell: bash
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/nightly-multi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,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
Expand Down Expand Up @@ -98,15 +98,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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/telemetry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
- name: Create upgrade test namespace
shell: bash
run: |
kubectl create ns camel-k
kubectl create ns camel

- name: Registry setting
uses: ./.github/actions/registry-setting
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/contributing/e2e.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Since both unit test and integration test names end with `_test.go`, both would

Look into the https://github.com/apache/camel-k/tree/main/e2e[/e2e] directory for examples of integration tests.

Before running an integration test, you need to be connected to a Kubernetes/OpenShift namespace and have the Camel K operator installed globally into a namespaced named `camel-k`. After you log into your cluster, you can run the following command to execute the suite of smoke tests:
Before running an integration test, you need to be connected to a Kubernetes/OpenShift namespace and have the Camel K operator installed globally into a namespaced named `camel`. After you log into your cluster, you can run the following command to execute the suite of smoke tests:

[source]
----
Expand Down
4 changes: 2 additions & 2 deletions docs/modules/ROOT/pages/contributing/local-development.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ For other cluster types you may check the specific documentation. As soon as you
make images
----

This command will build and publish your actual Camel K development version to the container registry. At this stage installing the Camel K development version will be as easy as a typical installation. We are supporting a series of makefile targets to let you easily install the operator on your local cluster in one single line. These targets are though to cover plain Kubernetes and Openshift cluster in either global (default in `camel-k` namespace) and namespaced (default in `default` namespace) installation:
This command will build and publish your actual Camel K development version to the container registry. At this stage installing the Camel K development version will be as easy as a typical installation. We are supporting a series of makefile targets to let you easily install the operator on your local cluster in one single line. These targets are though to cover plain Kubernetes and Openshift cluster in either global (default in `camel` namespace) and namespaced (default in `default` namespace) installation:

[source]
----
make install-k8s-global (default in camel-k namespace)
make install-k8s-global (default in camel namespace)
make install-k8s-ns (default in default namespace)
----

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The list of available container images is published in (https://hub.docker.com/r
If you want to use a different container image instead of the default, you will need to edit your operator Deployment by replacing the default image with the one you're choosing. You can use the following script in order to change on the fly the value and install a Camel K JDK 21 based operator:

```bash
kustomize build github.com/apache/camel-k/install/overlays/all-namespaces?ref=v2.6.0 | sed 's#docker.io/apache/camel-k:2.6.0#docker.io/apache/camel-k:2.6.0-21-jdk#g' | kubectl apply -f - --server-side -n camel-k
kustomize build github.com/apache/camel-k/install/overlays/all-namespaces?ref=v2.6.0 | sed 's#docker.io/apache/camel-k:2.6.0#docker.io/apache/camel-k:2.6.0-21-jdk#g' | kubectl apply -f - --server-side -n camel
```

During the build, you should see the version used in the Maven building log traces:
Expand Down
6 changes: 3 additions & 3 deletions docs/modules/ROOT/pages/installation/installation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ https://kustomize.io[Kustomize] provides a declarative approach to the configura
$ kubectl apply -k github.com/apache/camel-k/install/overlays/all-namespaces?ref=v{last-released-version} --server-side
----

You can specify as `ref` parameter the version you're willing to install (ie, `v{last-released-version}`). The command above will install a descoped (global) operator in the camel-k namespace. This is the suggested configuration in order to manage Integrations in all namespaces.
You can specify as `ref` parameter the version you're willing to install (ie, `v{last-released-version}`). The command above will install a descoped (global) operator in the camel namespace. This is the suggested configuration in order to manage Integrations in all namespaces.

[[helm]]
== Installation via Helm Hub
Expand All @@ -22,7 +22,7 @@ Camel K is available in Helm Hub:

```
$ helm repo add camel-k https://apache.github.io/camel-k/charts/
$ helm install camel-k camel-k/camel-k -n camel-k
$ helm install camel-k camel-k/camel-k -n camel
```

More instructions on the https://hub.helm.sh/charts/camel-k/camel-k[Camel K Helm] page.
Expand Down Expand Up @@ -67,7 +67,7 @@ Each installation method have its proper way to setup configuration. A common on
In order to verify that the operator is up and running, you should be able to see a Camel K operator `Pod` running in the namespace used, for example:

```
kubectl get pods -n camel-k
kubectl get pods -n camel
NAME READY STATUS RESTARTS AGE
camel-k-operator-5b686db99f-c2k2s 1/1 Running 0 3m46s
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ You can also provide those configuration in the Camel K configmap:
kubectl create configmap camel-k-operator-configmap-configuration \
--from-literal=REGISTRY_ADDRESS="10.102.190.238" \
--from-literal=REGISTRY_INSECURE="true" \
-n camel-k
-n camel
```
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ NOTE: before version 2.6, Camel K used S2I as a default publishing strategy agai
The first thing you need to do is to create an access token for the service account you want to use to pull/push images from the registry. We suggest to use the `camel-k-builder` Service Account which was created during the installation procedure and is normally used to perform "building" operations.

```bash
oc serviceaccounts new-token camel-k-builder -n camel-k
oc serviceaccounts new-token camel-k-builder -n camel
eyJhb[...]Uhz0
```

WARNING: treat the token with the due level of confidentiality.

You will need to use this token to create a secret:
```bash
oc create secret docker-registry ocp-registry --docker-server image-registry.openshift-image-registry.svc:5000 --docker-username camel-k-builder --docker-password eyJhb[...]Uhz0 -n camel-k
oc create secret docker-registry ocp-registry --docker-server image-registry.openshift-image-registry.svc:5000 --docker-username camel-k-builder --docker-password eyJhb[...]Uhz0 -n camel
```

NOTE: `image-registry.openshift-image-registry.svc:5000` is the default internal route exposed by Openshift. You may need to use an alternative route according to the configuration of your cluster.
Expand All @@ -27,8 +27,8 @@ NOTE: `image-registry.openshift-image-registry.svc:5000` is the default internal
Before being able to pull and push containers images to the registry, you need to provide the proper privileges to access:

```bash
oc policy add-role-to-user registry-viewer -z camel-k-builder -n camel-k
oc policy add-role-to-user registry-editor -z camel-k-builder -n camel-k
oc policy add-role-to-user registry-viewer -z camel-k-builder -n camel
oc policy add-role-to-user registry-editor -z camel-k-builder -n camel
```

NOTE: `-z` identifies a Service Account.
Expand Down
6 changes: 3 additions & 3 deletions docs/modules/ROOT/pages/installation/uninstalling.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ Another alternative is to delete the resources the operator is using in a contro

== Uninstall operator only (keeps CRDs and any running Integration)

In order to remove the operator and any configuration resource it uses you'll need to perform the following cleaning operation. Here we're assuming you have installed an operator in the namespace camel-k:
In order to remove the operator and any configuration resource it uses you'll need to perform the following cleaning operation. Here we're assuming you have installed an operator in the namespace camel:

```
$ kubectl delete deploy -l app=camel-k -n camel-k
$ kubectl delete configmap,secret,sa,rolebindings,clusterrolebindings,roles,clusterroles,integrationplatform -l app=camel-k -n camel-k
$ kubectl delete deploy -l app=camel-k -n camel
$ kubectl delete configmap,secret,sa,rolebindings,clusterrolebindings,roles,clusterroles,integrationplatform -l app=camel-k -n camel
```

Notice that you need to perform two operation to let the Kubernetes finalizers running in the Deployment object to complete before removing any required additional resource (ie, the ServiceAccount holding such privileges).
Expand Down
4 changes: 2 additions & 2 deletions docs/modules/ROOT/pages/kamelets/distribution.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ There is not a prescribed way how to release the Kamelets on the cluster. It can

When you install Camel K, you may want a series of Kamelets which are coming from the xref:camel-kamelets::index.adoc[Apache Kamelet Catalog]. This is a facility that will let you immediately use a wide set of connector-style resources to interact with any event source and sink.

You can install any catalog version available by downloading locally the catalog and installing to the cluster. For example, this script download a given version of the catalog and install into the `camel-k` namespace:
You can install any catalog version available by downloading locally the catalog and installing to the cluster. For example, this script download a given version of the catalog and install into the `camel` namespace:

```
mvn -q dependency:copy -Dartifact=org.apache.camel.kamelets:camel-kamelets:4.18.0: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
```

NOTE: you can install any other custom catalog in a similar manner.
Expand Down
Loading
Loading