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
commit 80fba68834d9a3df916a61768d217b3714719632 Author: Marat Gubaidullin <marat.gubaidul...@gmail.com> AuthorDate: Fri Dec 16 13:25:32 2022 -0500 jkube push stuff for #561 --- .../src/main/resources/spring-boot-builder-script-kubernetes.sh | 5 +++-- .../src/main/resources/spring-boot-builder-script-openshift.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh index 63a6e71..c2ea625 100644 --- a/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh +++ b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh @@ -21,7 +21,8 @@ export DATE=$(date '+%Y%m%d%H%M%S') export TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) export NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace) -/opt/mvnd/bin/mvnd package k8s:build k8s:resource k8s:apply \ +/opt/mvnd/bin/mvnd package k8s:build k8s:push k8s:resource k8s:apply \ -Pkubernetes \ -Djkube.namespace=${NAMESPACE} \ - -Djkube.generator.name=${IMAGE_REGISTRY}/${NAMESPACE}/$NAME:${DATE} \ \ No newline at end of file + -Djkube.docker.push.registry=${IMAGE_REGISTRY} \ + -Djkube.generator.name=${IMAGE_REGISTRY}/${NAMESPACE}/$(inputs.params.project):${DATE} \ No newline at end of file diff --git a/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh index 50b1fb6..21a660c 100644 --- a/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh +++ b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh @@ -21,7 +21,8 @@ export DATE=$(date '+%Y%m%d%H%M%S') export TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) export NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace) -/opt/mvnd/bin/mvnd package oc:build oc:resource oc:apply \ +/opt/mvnd/bin/mvnd package oc:build oc:push oc:resource oc:apply \ -Popenshift \ -Djkube.namespace=${NAMESPACE} \ - -Djkube.generator.name=${IMAGE_REGISTRY}/${NAMESPACE}/$NAME:${DATE} \ + -Djkube.docker.push.registry=${IMAGE_REGISTRY} \ + -Djkube.generator.name=${IMAGE_REGISTRY}/${NAMESPACE}/$(inputs.params.project):${DATE}