Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes on env vars and runtime for kubernetes #1389

Merged
merged 6 commits into from
Sep 1, 2024
Merged

Minor fixes on env vars and runtime for kubernetes #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f27549a
fix: Fix env vars on k8s
thgruiz Aug 28, 2024
8fada62
fix(app): Fix unused JAVA_OPTS from kavaran-app docker image
thgruiz Aug 28, 2024
fd04f6c
fix(app): Adds default runtime for jbang build on kubernetes
thgruiz Aug 28, 2024
5b27256
chore(app): Removed defaults of JAVA_OPTS from kavaran-app docker image
thgruiz Aug 29, 2024
3c566e4
fix(app): Adds default runtime for jbang build on docker
thgruiz Aug 29, 2024
bd455fa
chore(app): Removed Hazelcast java opts from docker image
thgruiz Sep 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions docs/install/karavan-kubernetes/deployment.yaml
View file
Open in desktop
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
View file
Open in desktop
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"

2 changes: 1 addition & 1 deletion karavan-app/src/main/resources/configuration/docker/build.sh
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion karavan-app/src/main/resources/configuration/kubernetes/build.sh
View file
Open in desktop
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