Skip to content

Commit

Permalink
Minor fixes on env vars and runtime for kubernetes (#1389)
Browse files Browse the repository at this point in the history
* fix: Fix env vars on k8s

The vars used by quarkus need to be upper case
and dots replaced by underscore to work

* fix(app): Fix unused JAVA_OPTS from kavaran-app docker image

Now the ENV will be used on the command line
(that was replaced from exec form to shell form of docker's CMD
as in the the devmode docker image)

* fix(app): Adds default runtime for jbang build on kubernetes

Without this the build fails.
(was added too the possibility to configure other runtime with an env var)

* chore(app): Removed defaults of JAVA_OPTS from kavaran-app docker image

Not needed anymore since Hazelcast was replaced by plain maps

* fix(app): Adds default runtime for jbang build on docker

* chore(app): Removed Hazelcast java opts from docker image

Not needed anymore since Hazelcast was replaced by plain maps
  • Loading branch information
thgruiz authored Sep 1, 2024
1 parent a1b0c33 commit 3a0eb24
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 22 deletions.
18 changes: 9 additions & 9 deletions docs/install/karavan-kubernetes/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,47 +23,47 @@ spec:
value: "3s"
- name: "KARAVAN_DEVMODE_IMAGE"
value: "ghcr.io/apache/camel-karavan-devmode:4.7.1"
- name: "karavan.git.repository"
- name: "KARAVAN_GIT_REPOSITORY"
valueFrom:
secretKeyRef:
key: "karavan.git.repository"
name: "karavan"
- name: "karavan.git.username"
- name: "KARAVAN_GIT_USERNAME"
valueFrom:
secretKeyRef:
key: "karavan.git.username"
name: "karavan"
- name: "karavan.git.password"
- name: "KARAVAN_GIT_PASSWORD"
valueFrom:
secretKeyRef:
key: "karavan.git.password"
name: "karavan"
- name: "karavan.git.branch"
- name: "KARAVAN_GIT_BRANCH"
valueFrom:
secretKeyRef:
key: "karavan.git.branch"
name: "karavan"
- name: "karavan.keycloak.url"
- name: "KARAVAN_KEYCLOAK_URL"
valueFrom:
secretKeyRef:
key: "karavan.keycloak.url"
name: "karavan"
- name: "karavan.keycloak.realm"
- name: "KARAVAN_KEYCLOAK_REALM"
valueFrom:
secretKeyRef:
key: "karavan.keycloak.realm"
name: "karavan"
- name: "karavan.keycloak.frontend.clientId"
- name: "KARAVAN_KEYCLOAK_FRONTEND_CLIENTID"
valueFrom:
secretKeyRef:
key: "karavan.keycloak.frontend.clientId"
name: "karavan"
- name: "karavan.keycloak.backend.clientId"
- name: "KARAVAN_KEYCLOAK_BACKEND_CLIENTID"
valueFrom:
secretKeyRef:
key: "karavan.keycloak.backend.clientId"
name: "karavan"
- name: "karavan.keycloak.backend.secret"
- name: "KARAVAN_KEYCLOAK_BACKEND_SECRET"
valueFrom:
secretKeyRef:
key: "karavan.keycloak.backend.secret"
Expand Down
15 changes: 4 additions & 11 deletions karavan-app/src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,9 @@ LABEL "org.apache.camel.karavan/type"="internal"

RUN mkdir /opt/app
COPY target/*-runner.jar /opt/app/karavan.jar
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager -XX:-UseG1GC -XX:+UseZGC"
EXPOSE 8080
CMD ["java", \
"--add-modules", "java.se", \
"--add-exports", "java.base/jdk.internal.ref=ALL-UNNAMED", \
"--add-opens", "java.base/java.lang=ALL-UNNAMED", \
"--add-opens", "java.base/java.nio=ALL-UNNAMED", \
"--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", \
"--add-opens", "java.management/sun.management=ALL-UNNAMED", \
"--add-opens", "jdk.management/com.ibm.lang.management.internal=ALL-UNNAMED", \
"--add-opens", "jdk.management/com.sun.management.internal=ALL-UNNAMED", \
"-jar", "/opt/app/karavan.jar"]

CMD exec "java" \
${JAVA_OPTS} \
"-jar" "/opt/app/karavan.jar"

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ git clone --depth 1 --branch $GIT_BRANCH $GIT_REPOSITORY $CODE_DIR

cd $CODE_DIR/$PROJECT_ID

jbang -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export --local-kamelet-dir=$KAMELETS_DIR
jbang -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export --local-kamelet-dir=$KAMELETS_DIR --runtime=${CAMEL_JBANG_RUNTIME:-camel-main}

mvn package jib:build \
-Djib.allowInsecureRegistries=true \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ git clone --depth 1 --branch $GIT_BRANCH $GIT_REPOSITORY $CODE_DIR

cd $CODE_DIR/$PROJECT_ID

jbang -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export --local-kamelet-dir=$KAMELETS_DIR
jbang -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export --local-kamelet-dir=$KAMELETS_DIR --runtime=${CAMEL_JBANG_RUNTIME:-camel-main}

mvn package jib:build k8s:resource k8s:apply \
-Djkube.namespace=${NAMESPACE} \
Expand Down

0 comments on commit 3a0eb24

Please sign in to comment.