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 2f5e3892 Fix #1145
2f5e3892 is described below
commit 2f5e3892a470e054a03b342682f1a885bf5bc7ba
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Fri Feb 23 17:08:59 2024 -0500
Fix #1145
---
.../src/main/resources/snippets/kubernetes-application.properties | 3 ++-
karavan-app/src/main/resources/snippets/kubernetes-build.sh | 2 ++
.../src/main/resources/snippets/kubernetes-builder-env.properties | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/karavan-app/src/main/resources/snippets/kubernetes-application.properties
b/karavan-app/src/main/resources/snippets/kubernetes-application.properties
index 832343a9..09418d44 100644
--- a/karavan-app/src/main/resources/snippets/kubernetes-application.properties
+++ b/karavan-app/src/main/resources/snippets/kubernetes-application.properties
@@ -21,10 +21,11 @@ camel.routecontroller.threadPoolSize=3
camel.context.dev-console=true
label.runtime=app.kubernetes.io/runtime
jib.from.image=gcr.io/distroless/java17@sha256:85c2fa20773270fe6fecf576dd5a53f5bb8b914e57a463c533dac034c51862d9
+#jib.from.image=gcr.io/distroless/java17-debian11:nonroot-arm64
jkube.version=1.16.0
jkube.skip.build=true
jkube.namespace=default
-jkube.imagePullPolicy=IfNotPresent
+jkube.imagePullPolicy=Always
jkube.enricher.jkube-controller.type=Deployment
jkube.enricher.jkube-controller.replicaCount=1
jkube.enricher.jkube-service.port=80:8080,443:8080
diff --git a/karavan-app/src/main/resources/snippets/kubernetes-build.sh
b/karavan-app/src/main/resources/snippets/kubernetes-build.sh
index bbfffbb0..ba8fd596 100644
--- a/karavan-app/src/main/resources/snippets/kubernetes-build.sh
+++ b/karavan-app/src/main/resources/snippets/kubernetes-build.sh
@@ -26,6 +26,8 @@ export NAMESPACE=$(cat
/var/run/secrets/kubernetes.io/serviceaccount/namespace)
mvn package jib:build k8s:resource k8s:apply \
-Djkube.namespace=${NAMESPACE} \
-Djib.allowInsecureRegistries=true \
+# -Djib.from.platforms=linux/arm64 \
+# -Djib.platform.architecture=arm64 \
-Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/${PROJECT_ID}:${TAG} \
-Djib.to.auth.username=${IMAGE_REGISTRY_USERNAME} \
-Djib.to.auth.password=${IMAGE_REGISTRY_PASSWORD}
\ No newline at end of file
diff --git
a/karavan-app/src/main/resources/snippets/kubernetes-builder-env.properties
b/karavan-app/src/main/resources/snippets/kubernetes-builder-env.properties
index 5e13d78f..77996d19 100644
--- a/karavan-app/src/main/resources/snippets/kubernetes-builder-env.properties
+++ b/karavan-app/src/main/resources/snippets/kubernetes-builder-env.properties
@@ -1,6 +1,6 @@
IMAGE_REGISTRY=karavan:karavan.container-image.registry
IMAGE_REGISTRY_USERNAME=karavan:karavan.container-image.registry-username
-IMAGE_REGISTRY_PASSWORD=karavan:karavan.container-image.password
+IMAGE_REGISTRY_PASSWORD=karavan:karavan.container-image.registry-password
IMAGE_GROUP=karavan:karavan.container-image.group
GIT_REPOSITORY=karavan:karavan.git.repository
GIT_USERNAME=karavan:karavan.git.username
