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 e5db5789f6a5ef5aa552303849ba7f5c3a0b1058
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Mon Sep 19 17:55:56 2022 -0400
Deployment instead of DeploymentConfig in manifests
---
karavan-cloud/openshift/karavan-acl.yaml | 1 -
karavan-cloud/openshift/karavan-app-basic.yaml | 2 +-
karavan-cloud/openshift/karavan-app-oidc.yaml | 2 +-
karavan-cloud/openshift/karavan-app-public.yaml | 2 +-
karavan-cloud/openshift/karavan-quarkus-task.yaml | 10 +++-------
5 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/karavan-cloud/openshift/karavan-acl.yaml
b/karavan-cloud/openshift/karavan-acl.yaml
index ec92c7f..1a8af31 100644
--- a/karavan-cloud/openshift/karavan-acl.yaml
+++ b/karavan-cloud/openshift/karavan-acl.yaml
@@ -5,7 +5,6 @@ metadata:
name: karavan
labels:
app.kubernetes.io/name: karavan
- app.openshift.io/runtime: camel
---
# Role karavan-app
apiVersion: rbac.authorization.k8s.io/v1
diff --git a/karavan-cloud/openshift/karavan-app-basic.yaml
b/karavan-cloud/openshift/karavan-app-basic.yaml
index 959478d..8b52066 100644
--- a/karavan-cloud/openshift/karavan-app-basic.yaml
+++ b/karavan-cloud/openshift/karavan-app-basic.yaml
@@ -20,7 +20,7 @@ kind: Deployment
metadata:
labels:
app: karavan
- app.openshift.io/runtime: camel
+ app.openshift.io/runtime: quarkus
app.kubernetes.io/part-of: karavan
name: karavan
spec:
diff --git a/karavan-cloud/openshift/karavan-app-oidc.yaml
b/karavan-cloud/openshift/karavan-app-oidc.yaml
index a0d3d72..dae7d23 100644
--- a/karavan-cloud/openshift/karavan-app-oidc.yaml
+++ b/karavan-cloud/openshift/karavan-app-oidc.yaml
@@ -20,7 +20,7 @@ kind: Deployment
metadata:
labels:
app: karavan
- app.openshift.io/runtime: camel
+ app.openshift.io/runtime: quarkus
app.kubernetes.io/part-of: karavan
name: karavan
spec:
diff --git a/karavan-cloud/openshift/karavan-app-public.yaml
b/karavan-cloud/openshift/karavan-app-public.yaml
index 4549b96..9936bea 100644
--- a/karavan-cloud/openshift/karavan-app-public.yaml
+++ b/karavan-cloud/openshift/karavan-app-public.yaml
@@ -20,7 +20,7 @@ kind: Deployment
metadata:
labels:
app: karavan
- app.openshift.io/runtime: camel
+ app.openshift.io/runtime: quarkus
app.kubernetes.io/part-of: karavan
name: karavan
spec:
diff --git a/karavan-cloud/openshift/karavan-quarkus-task.yaml
b/karavan-cloud/openshift/karavan-quarkus-task.yaml
index 492f596..24aa8cc 100644
--- a/karavan-cloud/openshift/karavan-quarkus-task.yaml
+++ b/karavan-cloud/openshift/karavan-quarkus-task.yaml
@@ -54,6 +54,9 @@ spec:
-Dquarkus.kubernetes-client.master-url=kubernetes.default.svc \
-Dquarkus.kubernetes-client.token=${TOKEN} \
-Dquarkus.kubernetes.deploy=true \
+ -Dquarkus.openshift.deployment-kind=Deployment \
+ -Dquarkus.openshift.add-version-to-label-selectors=false \
+ -Dquarkus.openshift.labels."app.openshift.io/runtime"=camel \
-Dquarkus.container-image.group=${NAMESPACE} \
-Dquarkus.container-image.tag=${DATE}
image: ghcr.io/apache/camel-karavan-builder:3.18.4
@@ -98,13 +101,6 @@ spec:
secretKeyRef:
name: karavan
key: kamelets-git-main
- - name: rollout
- image: >-
- image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
- script: |
- #!/usr/bin/env bash
- oc rollout latest dc/$(inputs.params.project)
- oc label dc/$(inputs.params.project) app.openshift.io/runtime=camel
--overwrite=true
workspaces:
- mountPath: /root/.m2
name: m2-cache
