From 4d72b80cf273e87ee8469fceeb3f81ea9f5ae60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Wed, 4 Dec 2024 15:11:23 +0100 Subject: [PATCH] Use Camel 4.9.0 by default for Camel JBang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By default, Camel Jbang is now using Jib and not Docker and providing a multi-arch platform and the way to produce images are no more the same consequently: * a specific registry must be configured. We found only using Docker to make it working with Minikube. * qemu is required for the multi-arch with Docker * resgitry-alias is required because vs code tasks cannot escape and interpret correctly the env command of the registry setup note that it is fixing the deploy only. The debug (and so remaining test failures) is not working due to https://issues.apache.org/jira/browse/CAMEL-21612 Signed-off-by: Aurélien Pupier --- .github/workflows/deploy.yaml | 13 ++++++++++++- CHANGELOG.md | 2 ++ package.json | 2 +- src/ui-test/resources/vscode-settings.json | 9 ++++++++- src/ui-test/tests/deploy.kubernetes.run.test.ts | 2 +- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 0ea33039..8d5efc58 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -43,12 +43,17 @@ jobs: with: node-version: 20 cache: npm + - id: setup-docker-qemu + name: Set up QEMU + uses: docker/setup-qemu-action@v3 - name: Start Minikube uses: medyagh/setup-minikube@latest with: driver: docker - addons: registry + addons: registry,registry-aliases + container-runtime: docker + insecure-registry: '10.0.0.0/24' - name: Cluster info run: | @@ -62,6 +67,12 @@ jobs: - name: Compile run: npm run compile + + - name: set env + run: | + eval $(minikube -p minikube docker-env) + echo "INSTALL_REGISTRY=$(kubectl -n kube-system get service registry -o jsonpath='{.spec.clusterIP}')" >> $GITHUB_ENV + echo $INSTALL_REGISTRY - name: UI Tests run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a276d16..dd5b15e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to the "vscode-debug-adapter-apache-camel" extension will be ## 1.6.0 +- Update default Camel version used for Camel JBang from 4.8.1 to 4.9.0 + ## 1.5.0 - Use containing folder by default with commands and quick editor action when launching a specific Camel Route. It allows to have other relative parameters still working when it is inside a subfolder. diff --git a/package.json b/package.json index d6cc6974..8c827728 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "camel.debugAdapter.JBangVersion": { "type": "string", "markdownDescription": "Apache Camel JBang CLI version used for internal VS Code JBang commands execution. Camel JBang CLI requirements can differ between versions, it is recommended to use `default` version to ensure all extension features work properly.\n\n**Note**: This change will affect only commands provided by Debug Adapter for Apache Camel extension.", - "default": "4.8.1" + "default": "4.9.0" }, "camel.debugAdapter.CamelVersion": { "type": "string", diff --git a/src/ui-test/resources/vscode-settings.json b/src/ui-test/resources/vscode-settings.json index 2c5e1b00..3effa05d 100644 --- a/src/ui-test/resources/vscode-settings.json +++ b/src/ui-test/resources/vscode-settings.json @@ -17,6 +17,13 @@ "git.autoRepositoryDetection": false, "camel.debugAdapter.KubernetesRunParameters": [ "--cluster-type=minikube", - "--build-property=quarkus.kubernetes.image-pull-policy=Never" + "--build-property=quarkus.kubernetes.image-pull-policy=Never", + "--image-builder=docker", + "--image-registry", + "registry.minikube", + "--trait", + "container.image-push=true", + "--trait", + "container.image-pull-policy=IfNotPresent" ] } diff --git a/src/ui-test/tests/deploy.kubernetes.run.test.ts b/src/ui-test/tests/deploy.kubernetes.run.test.ts index 6cbab899..261163a7 100644 --- a/src/ui-test/tests/deploy.kubernetes.run.test.ts +++ b/src/ui-test/tests/deploy.kubernetes.run.test.ts @@ -63,7 +63,7 @@ describe('Camel standalone file deployment using Camel JBang Kubernetes Run', fu // using some additional steps for CAMEL 4.9.0-SNAPSHOT / 4.8.1 version // because the '--dev' parameter is not working for a deployment to Kubernetes - await waitUntilTerminalHasText(action.getDriver(), ['BUILD SUCCESS'], 3_000, 120_000); + await waitUntilTerminalHasText(action.getDriver(), ['BUILD SUCCESS'], 3_000, 240_000); await killTerminal(); const terminalView = await new BottomBarPanel().openTerminalView();