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
The following commit(s) were added to refs/heads/main by this push:
new e605111 New karavan CRD examples
e605111 is described below
commit e605111ad23ad8986949d0dac3878277f0ca984d
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Thu Dec 15 12:41:14 2022 -0500
New karavan CRD examples
---
karavan-cloud/minikube/karavan-secret.yaml | 12 ++++-------
karavan-cloud/minikube/karavan.yaml | 3 ++-
karavan-cloud/openshift/karavan-secret.yaml | 12 ++++-------
karavan-cloud/openshift/karavan.yaml | 3 ++-
.../operator/resource/KaravanTektonTask.java | 24 ++++++++--------------
5 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/karavan-cloud/minikube/karavan-secret.yaml
b/karavan-cloud/minikube/karavan-secret.yaml
index cea29e4..7f1b8a7 100644
--- a/karavan-cloud/minikube/karavan-secret.yaml
+++ b/karavan-cloud/minikube/karavan-secret.yaml
@@ -8,12 +8,8 @@ stringData:
oidc-secret: XXXXX
oidc-server-url: https://localhost/auth/realms/karavan
oidc-frontend-url: https://localhost/auth
- projects-git-repository:
http://gitea.karavan.svc.cluster.local:3000/karavan/projects.git
- projects-git-password: karavan
- projects-git-username: karavan
- projects-git-branch: main
- kamelets-git-repository:
http://gitea.karavan.svc.cluster.local:3000/karavan/kamelets.git
- kamelets-git-password: karavan
- kamelets-git-username: karavan
- kamelets-git-branch: main
+ git-repository:
http://gitea.karavan.svc.cluster.local:3000/karavan/projects.git
+ git-password: karavan
+ git-username: karavan
+ git-branch: main
image-registry: 10.108.175.208
diff --git a/karavan-cloud/minikube/karavan.yaml
b/karavan-cloud/minikube/karavan.yaml
index 8bfa138..ed20c3a 100644
--- a/karavan-cloud/minikube/karavan.yaml
+++ b/karavan-cloud/minikube/karavan.yaml
@@ -6,5 +6,6 @@ metadata:
spec:
instances: 1
auth: public
- type: dev
+ environment: dev
+ runtimes: quarkus,spring-boot
nodePort: 30777
\ No newline at end of file
diff --git a/karavan-cloud/openshift/karavan-secret.yaml
b/karavan-cloud/openshift/karavan-secret.yaml
index 89b666d..a060bae 100644
--- a/karavan-cloud/openshift/karavan-secret.yaml
+++ b/karavan-cloud/openshift/karavan-secret.yaml
@@ -8,12 +8,8 @@ stringData:
oidc-secret: XXXXX
oidc-server-url: https://localhost/auth/realms/karavan
oidc-frontend-url: https://localhost/auth
- projects-git-repository:
http://gitea.karavan.svc.cluster.local:3000/karavan/projects.git
- projects-git-password: karavan
- projects-git-username: karavan
- projects-git-branch: main
- kamelets-git-repository:
http://gitea.karavan.svc.cluster.local:3000/karavan/kamelets.git
- kamelets-git-password: karavan
- kamelets-git-username: karavan
- kamelets-git-branch: main
+ git-repository:
http://gitea.karavan.svc.cluster.local:3000/karavan/projects.git
+ git-password: karavan
+ git-username: karavan
+ git-branch: main
image-registry: image-registry.openshift-image-registry.svc:5000
diff --git a/karavan-cloud/openshift/karavan.yaml
b/karavan-cloud/openshift/karavan.yaml
index a3ffdb2..0f7f248 100644
--- a/karavan-cloud/openshift/karavan.yaml
+++ b/karavan-cloud/openshift/karavan.yaml
@@ -6,4 +6,5 @@ metadata:
spec:
instances: 1
auth: public
- type: dev
\ No newline at end of file
+ environment: dev
+ runtimes: quarkus,spring-boot
\ No newline at end of file
diff --git
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanTektonTask.java
b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanTektonTask.java
index 623056f..d59a563 100644
---
a/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanTektonTask.java
+++
b/karavan-operator/src/main/java/org/apache/camel/karavan/operator/resource/KaravanTektonTask.java
@@ -79,22 +79,14 @@ public class KaravanTektonTask extends
CRUDKubernetesDependentResource<Task, Kar
.withScript(script)
.withImage(image + ":" + version)
.withEnv(
- new
EnvVarBuilder().withName("PROJECTS_GIT_REPOSITORY").withValueFrom(
- new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("projects-git-repository").and().build()).build(),
- new
EnvVarBuilder().withName("PROJECTS_GIT_USERNAME").withValueFrom(
- new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("projects-git-username").and().build()).build(),
- new
EnvVarBuilder().withName("PROJECTS_GIT_PASSWORD").withValueFrom(
- new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("projects-git-password").and().build()).build(),
- new
EnvVarBuilder().withName("PROJECTS_GIT_BRANCH").withValueFrom(
- new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("projects-git-branch").and().build()).build(),
- new
EnvVarBuilder().withName("KAMELETS_GIT_REPOSITORY").withValueFrom(
- new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("kamelets-git-repository").and().build()).build(),
- new
EnvVarBuilder().withName("KAMELETS_GIT_USERNAME").withValueFrom(
- new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("kamelets-git-username").and().build()).build(),
- new
EnvVarBuilder().withName("KAMELETS_GIT_PASSWORD").withValueFrom(
- new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("kamelets-git-password").and().build()).build(),
- new
EnvVarBuilder().withName("KAMELETS_GIT_BRANCH").withValueFrom(
- new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("kamelets-git-branch").and().build()).build(),
+ new
EnvVarBuilder().withName("GIT_REPOSITORY").withValueFrom(
+ new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("git-repository").and().build()).build(),
+ new
EnvVarBuilder().withName("GIT_USERNAME").withValueFrom(
+ new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("git-username").and().build()).build(),
+ new
EnvVarBuilder().withName("GIT_PASSWORD").withValueFrom(
+ new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("git-password").and().build()).build(),
+ new
EnvVarBuilder().withName("GIT_BRANCH").withValueFrom(
+ new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("git-branch").and().build()).build(),
new
EnvVarBuilder().withName("IMAGE_REGISTRY").withValueFrom(
new
EnvVarSourceBuilder().withNewSecretKeyRef().withName("karavan").withKey("image-registry").withOptional(true).and().build()).build()
)
