You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2022/12/16 21:19:43 UTC
[camel-karavan] 02/02: Unified pod label name for project (springboot and quarkus)
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 27bc6658071caac0f167002176e0e7dcca348ec3
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Fri Dec 16 16:19:29 2022 -0500
Unified pod label name for project (springboot and quarkus)
---
.../main/java/org/apache/camel/karavan/informer/PodEventHandler.java | 2 +-
.../src/main/resources/quarkus-builder-script-kubernetes.sh | 1 +
karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java b/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java
index 0f960bf..1e89077 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/informer/PodEventHandler.java
@@ -60,7 +60,7 @@ public class PodEventHandler implements ResourceEventHandler<Pod> {
public PodStatus getPodStatus(Pod pod) {
- String deployment = pod.getMetadata().getLabels().get("app.kubernetes.io/name");
+ String deployment = pod.getMetadata().getLabels().get("app");
try {
Optional<PodCondition> initialized = pod.getStatus().getConditions().stream().filter(c -> c.getType().equals("Initialized")).findFirst();
Optional<PodCondition> ready = pod.getStatus().getConditions().stream().filter(c -> c.getType().equals("Initialized")).findFirst();
diff --git a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
index 91d4aa3..608cb81 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -32,6 +32,7 @@ export NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
-Dquarkus.kubernetes.deploy=true \
-Dquarkus.kubernetes.deployment-target=kubernetes \
-Dquarkus.kubernetes.add-version-to-label-selectors=false \
+ -Dquarkus.openshift.labels.\"app\"=$(inputs.params.project) \
-Dquarkus.kubernetes.labels.\"app.kubernetes.io/runtime\"=camel \
-Dquarkus.container-image.group=${NAMESPACE} \
-Dquarkus.container-image.tag=${DATE}
\ No newline at end of file
diff --git a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
index 6fbb623..71e181d 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
@@ -34,6 +34,7 @@ export NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
-Dquarkus.kubernetes.deploy=true \
-Dquarkus.openshift.deployment-kind=Deployment \
-Dquarkus.openshift.add-version-to-label-selectors=false \
+ -Dquarkus.openshift.labels.\"app\"=$(inputs.params.project) \
-Dquarkus.openshift.labels.\"app.openshift.io/runtime\"=camel \
-Dquarkus.container-image.group=${NAMESPACE} \
-Dquarkus.container-image.tag=${DATE}
\ No newline at end of file