This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new de14e3b6 Deploy from vscode #839
de14e3b6 is described below
commit de14e3b6b34d8972caed4188ce4d568c750461cd
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Wed Aug 2 17:37:48 2023 -0400
Deploy from vscode #839
---
karavan-vscode/CHANGELOG.md | 2 +-
karavan-vscode/package.json | 31 +++++++++++++---------
karavan-vscode/src/exec.ts | 4 +--
.../snippets/quarkus-docker-application.properties | 2 +-
.../quarkus-kubernetes-application.properties | 2 +-
.../quarkus-openshift-application.properties | 2 +-
karavan-web/karavan-operator/pom.xml | 2 +-
karavan-web/pom.xml | 2 +-
8 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/karavan-vscode/CHANGELOG.md b/karavan-vscode/CHANGELOG.md
index 2352520c..f26ed616 100644
--- a/karavan-vscode/CHANGELOG.md
+++ b/karavan-vscode/CHANGELOG.md
@@ -6,7 +6,7 @@
2. Kamelets 4.0.0-RC1
3. Spring Boot 3.1.2
4. jkube 1.13.1
-5. Quarkus 3.2.2.Final
+5. Quarkus 3.2.3.Final
## 3.21.0
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index c905ff67..6a498cda 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -204,7 +204,7 @@
},
"Karavan.camelmainKubernetesDeploy": {
"type": "string",
- "default": "eval $(minikube -p minikube docker-env) && mvn
-Pkubernetes clean package k8s:build k8s:resource k8s:apply",
+ "default": "eval $(minikube -p minikube docker-env) && mvn clean
package jib:dockerBuild k8s:resource k8s:apply ",
"description": "Camel-main deploy command for Kubernetes",
"scope": "machine",
"order": 70
@@ -237,7 +237,7 @@
"camel.karavan.project-description=$NAME",
"camel.karavan.target=$TARGET",
"camel.jbang.gav=$GAV",
- "camel.jbang.quarkusVersion=3.2.2.Final",
+ "camel.jbang.quarkusVersion=3.2.3.Final",
"camel.jbang.runtime=$RUNTIME",
"camel.jbang.exportDir=.export"
],
@@ -287,7 +287,10 @@
"camel.jbang.runtime=$RUNTIME",
"camel.jbang.exportDir=.export",
"camel.health.enabled=true",
- "camel.health.exposure-level=full"
+ "camel.health.exposure-level=full",
+ "camel.server.enabled=true",
+ "camel.server.healthCheckEnabled=true",
+ "camel.server.devConsoleEnabled=true"
],
"description": "Camel-main application.properties template",
"scope": "machine",
@@ -300,7 +303,6 @@
"type": "string"
},
"default": [
- "camel.jbang.quarkusVersion=3.2.2.Final",
"camel.jbang.dependencies=camel:microprofile-health,mvn:io.quarkus:quarkus-openshift,mvn:io.quarkus:quarkus-container-image-jib",
"# image build properties",
"quarkus.container-image.build=true",
@@ -310,6 +312,7 @@
"quarkus.container-image.builder=openshift",
"# for jib build uncomment and set pproperties",
"#quarkus.container-image.builder=jib",
+
"#quarkus.jib.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16",
"#quarkus.container-image.insecure=true",
"#quarkus.container-image.registry=",
"#quarkus.container-image.username=",
@@ -338,13 +341,13 @@
"type": "string"
},
"default": [
- "camel.jbang.quarkusVersion=3.2.2.Final",
"camel.jbang.dependencies=camel:microprofile-health,mvn:io.quarkus:quarkus-container-image-jib,mvn:io.quarkus:quarkus-kubernetes",
"# image build properties",
"quarkus.container-image.build=true",
"quarkus.container-image.group=default",
"quarkus.container-image.name=$NAME",
"quarkus.container-image.builder=jib",
+
"quarkus.jib.base-jvm-image=registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16",
"quarkus.container-image.insecure=true",
"quarkus.container-image.tag=${DATE}",
"# deployment properties",
@@ -367,7 +370,6 @@
"type": "string"
},
"default": [
- "camel.jbang.dependencies=camel:microprofile-health",
"# jkube properties",
"jkube.version=1.13.1",
"jkube.build.strategy=s2i",
@@ -410,7 +412,6 @@
"type": "string"
},
"default": [
- "camel.jbang.dependencies=camel:microprofile-health",
"# jkube properties",
"jkube.version=1.13.1",
"jkube.build.strategy=docker",
@@ -432,16 +433,22 @@
"type": "string"
},
"default": [
- "camel.jbang.dependencies=camel:microprofile-health",
- "# jkube properties",
+ "# kubernetes properties",
+ "label.runtime=app.kubernetes.io/runtime",
+
"jib.from.image=gcr.io/distroless/java17@sha256:3a4ea21bd7b412b8b6ae61313b39337d8f03bb6844013810e8e4625d8c765edb",
+ "jib.to.image=default/$NAME:${DATE}",
"jkube.version=1.13.1",
- "jkube.build.strategy=docker",
+ "jkube.skip.build=true",
+ "jkube.build.strategy=jib",
"jkube.namespace=default",
- "jkube.generator.name=default/$NAME:${DATE}",
+ "jkube.generator.name=${jib.to.image}",
"jkube.imagePullPolicy=IfNotPresent",
"jkube.enricher.jkube-controller.type=Deployment",
"jkube.enricher.jkube-controller.replicaCount=1",
- "jkube.enricher.jkube-service.port=80"
+ "jkube.enricher.jkube-service.port=80",
+ "jkube.enricher.jkube-project-label.group=karavan",
+ "jkube.enricher.jkube-project-label.provider=karavan",
+ "jkube.recreate=true"
],
"description": "application.properties template for camel-main on
Kubernetes",
"scope": "machine",
diff --git a/karavan-vscode/src/exec.ts b/karavan-vscode/src/exec.ts
index dbede1c3..a012ef33 100644
--- a/karavan-vscode/src/exec.ts
+++ b/karavan-vscode/src/exec.ts
@@ -65,9 +65,9 @@ export function camelDeploy(directory: string) {
const target = val[1] || '';
const exportFolder = val[2] || '';
let env: any = { "DATE": Date.now().toString() };
- if (target === 'openshift' && val[3].result) {
+ if (['openshift','kubernetes'].includes(target) && val[3].result) {
env.NAMESPACE = val[3].value.trim();
- } else if (target === 'openshift' && val[3].result === undefined) {
+ } else if (['openshift','kubernetes'].includes(target) &&
val[3].result === undefined) {
window.showErrorMessage("Namespace not set \n" + val[3].error);
}
const deployCommand: string =
workspace.getConfiguration().get("Karavan.".concat(runtime.replaceAll("-",
"")).concat(utils.capitalize(target)).concat("Deploy")) || '';
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/quarkus-docker-application.properties
b/karavan-web/karavan-app/src/main/resources/snippets/quarkus-docker-application.properties
index 83fe4779..49c94759 100644
---
a/karavan-web/karavan-app/src/main/resources/snippets/quarkus-docker-application.properties
+++
b/karavan-web/karavan-app/src/main/resources/snippets/quarkus-docker-application.properties
@@ -3,7 +3,7 @@ camel.karavan.project-name={projectName}
camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=quarkus
-camel.jbang.quarkusVersion=3.2.2.Final
+camel.jbang.quarkusVersion=3.2.3.Final
camel.jbang.dependencies=camel:microprofile-health,mvn:io.quarkus:quarkus-container-image-jib
camel.health.enabled=true
camel.health.exposure-level=full
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/quarkus-kubernetes-application.properties
b/karavan-web/karavan-app/src/main/resources/snippets/quarkus-kubernetes-application.properties
index e68ecafb..62f10dc2 100644
---
a/karavan-web/karavan-app/src/main/resources/snippets/quarkus-kubernetes-application.properties
+++
b/karavan-web/karavan-app/src/main/resources/snippets/quarkus-kubernetes-application.properties
@@ -3,7 +3,7 @@ camel.karavan.project-name={projectName}
camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=quarkus
-camel.jbang.quarkusVersion=3.2.2.Final
+camel.jbang.quarkusVersion=3.2.3.Final
camel.jbang.dependencies=camel:microprofile-health,mvn:io.quarkus:quarkus-kubernetes,mvn:io.quarkus:quarkus-container-image-jib
camel.health.enabled=true
camel.health.exposure-level=full
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/quarkus-openshift-application.properties
b/karavan-web/karavan-app/src/main/resources/snippets/quarkus-openshift-application.properties
index c59944c5..da52999c 100644
---
a/karavan-web/karavan-app/src/main/resources/snippets/quarkus-openshift-application.properties
+++
b/karavan-web/karavan-app/src/main/resources/snippets/quarkus-openshift-application.properties
@@ -3,7 +3,7 @@ camel.karavan.project-name={projectName}
camel.karavan.project-description={projectDescription}
camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=quarkus
-camel.jbang.quarkusVersion=3.2.2.Final
+camel.jbang.quarkusVersion=3.2.3.Final
camel.jbang.dependencies=camel:microprofile-health,mvn:io.quarkus:quarkus-openshift,mvn:io.quarkus:quarkus-container-image-jib
camel.health.enabled=true
camel.health.exposure-level=full
diff --git a/karavan-web/karavan-operator/pom.xml
b/karavan-web/karavan-operator/pom.xml
index 4f5e6ae7..76641c49 100644
--- a/karavan-web/karavan-operator/pom.xml
+++ b/karavan-web/karavan-operator/pom.xml
@@ -17,7 +17,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus-sdk.version>5.1.1</quarkus-sdk.version>
- <quarkus.version>3.2.2.Final</quarkus.version>
+ <quarkus.version>3.2.3.Final</quarkus.version>
</properties>
<dependencyManagement>
diff --git a/karavan-web/pom.xml b/karavan-web/pom.xml
index 56287116..2c09497e 100644
--- a/karavan-web/pom.xml
+++ b/karavan-web/pom.xml
@@ -19,7 +19,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
- <quarkus.platform.version>3.2.2.Final</quarkus.platform.version>
+ <quarkus.platform.version>3.2.3.Final</quarkus.platform.version>
<camel-quarkus.version>3.2.2</camel-quarkus.version>
<camel.version>4.0.0-RC1</camel.version>
<camel-kamelet.version>4.0.0-RC1</camel-kamelet.version>
