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/09/14 20:10:30 UTC
[camel-karavan] branch main updated: COnfiguration and manifests to deploy Karavan with OIDC on OpenShift
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 1e2d9e5 COnfiguration and manifests to deploy Karavan with OIDC on OpenShift
1e2d9e5 is described below
commit 1e2d9e5778e1a81367697d4e0cdd03611894f3ed
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Sep 14 16:10:19 2022 -0400
COnfiguration and manifests to deploy Karavan with OIDC on OpenShift
---
.gitignore | 3 ++-
.../src/main/resources/application.properties | 8 +++----
.../{karavan-app.yaml => karavan-app-bacis.yaml} | 4 +---
.../{karavan-app.yaml => karavan-app-oidc.yaml} | 13 +++++++----
.../{karavan-app.yaml => karavan-app-public.yaml} | 27 ----------------------
karavan-cloud/openshift/karavan-secret.yaml | 2 ++
karavan-cloud/openshift/kustomization.yaml | 2 +-
7 files changed, 17 insertions(+), 42 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7635fe2..7b70af2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,4 +57,5 @@ yarn-error.log*
/karavan-app/src/main/resources/kamelets/*
/karavan-core/lib/
**/*.tgz
-**/*.vsix
\ No newline at end of file
+**/*.vsix
+karavan-cloud/openshift/karavan-secret-real.yaml
diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties
index 284d4b3..f0bfa37 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -77,12 +77,13 @@ quarkus.http.auth.permission.public.policy=permit
quarkus.http.auth.permission.public.methods=GET,HEAD,POST
# SSO Authentication
+%oidc.karavan.auth=oidc
%oidc.quarkus.oidc.enabled=true
%oidc.quarkus.http.auth.basic=false
%oidc.quarkus.security.users.embedded.enabled=false
-%oidc.quarkus.oidc.auth-server-url=http://localhost:8081/realms/karavan
+%oidc.quarkus.oidc.auth-server-url=${oidc-server-url}
%oidc.quarkus.oidc.client-id=karavan-backend
-%oidc.quarkus.oidc.credentials.secret=D1MPIzn8I5RmItgsWGlJJoqzJ7gPPjb1
+%oidc.quarkus.oidc.credentials.secret=${oidc-secret}
%oidc.quarkus.oidc.application-type=service
%oidc.quarkus.oidc.tls.verification=none
%oidc.quarkus.oidc.roles.source=accesstoken
@@ -96,9 +97,6 @@ quarkus.keycloak.devservices.enabled=false
%basic.quarkus.http.auth.permission.authenticated.enabled=true
%basic.quarkus.http.auth.permission.public.enabled=true
%basic.quarkus.security.users.embedded.enabled=true
-%basic.quarkus.kubernetes.env.secrets=karavan
-%basic.quarkus.kubernetes.env.mapping.master-password.from-secret=karavan
-%basic.quarkus.kubernetes.env.mapping.master-password.with-key=master-password
%basic.quarkus.security.users.embedded.plain-text=true
%basic.quarkus.security.users.embedded.users.admin=${master-password}
%basic.quarkus.security.users.embedded.roles.admin=administrator,developer
diff --git a/karavan-cloud/openshift/karavan-app.yaml b/karavan-cloud/openshift/karavan-app-bacis.yaml
similarity index 92%
copy from karavan-cloud/openshift/karavan-app.yaml
copy to karavan-cloud/openshift/karavan-app-bacis.yaml
index e696f5a..28bb1d6 100644
--- a/karavan-cloud/openshift/karavan-app.yaml
+++ b/karavan-cloud/openshift/karavan-app-bacis.yaml
@@ -45,9 +45,7 @@ spec:
secretKeyRef:
key: master-password
name: karavan
- image: ghcr.io/apache/camel-karavan:3.18.3
- # image: ghcr.io/apache/camel-karavan-basic:3.18.3
- # image: ghcr.io/apache/camel-karavan-oidc:3.18.3
+ image: ghcr.io/apache/camel-karavan-basic:3.18.3
imagePullPolicy: Always
name: karavan
resources:
diff --git a/karavan-cloud/openshift/karavan-app.yaml b/karavan-cloud/openshift/karavan-app-oidc.yaml
similarity index 87%
copy from karavan-cloud/openshift/karavan-app.yaml
copy to karavan-cloud/openshift/karavan-app-oidc.yaml
index e696f5a..99906af 100644
--- a/karavan-cloud/openshift/karavan-app.yaml
+++ b/karavan-cloud/openshift/karavan-app-oidc.yaml
@@ -40,14 +40,17 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- - name: MASTER_PASSWORD
+ - name: OIDC_SERVER_URL
valueFrom:
secretKeyRef:
- key: master-password
+ key: oidc-server-url
name: karavan
- image: ghcr.io/apache/camel-karavan:3.18.3
- # image: ghcr.io/apache/camel-karavan-basic:3.18.3
- # image: ghcr.io/apache/camel-karavan-oidc:3.18.3
+ - name: OIDC_SECRET
+ valueFrom:
+ secretKeyRef:
+ key: oidc-secret
+ name: karavan
+ image: ghcr.io/apache/camel-karavan-oidc:3.18.3
imagePullPolicy: Always
name: karavan
resources:
diff --git a/karavan-cloud/openshift/karavan-app.yaml b/karavan-cloud/openshift/karavan-app-public.yaml
similarity index 61%
rename from karavan-cloud/openshift/karavan-app.yaml
rename to karavan-cloud/openshift/karavan-app-public.yaml
index e696f5a..8efd783 100644
--- a/karavan-cloud/openshift/karavan-app.yaml
+++ b/karavan-cloud/openshift/karavan-app-public.yaml
@@ -40,14 +40,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- - name: MASTER_PASSWORD
- valueFrom:
- secretKeyRef:
- key: master-password
- name: karavan
image: ghcr.io/apache/camel-karavan:3.18.3
- # image: ghcr.io/apache/camel-karavan-basic:3.18.3
- # image: ghcr.io/apache/camel-karavan-oidc:3.18.3
imagePullPolicy: Always
name: karavan
resources:
@@ -60,26 +53,6 @@ spec:
- containerPort: 8080
name: http
protocol: TCP
- # livenessProbe:
- # failureThreshold: 3
- # httpGet:
- # path: /q/health/live
- # port: 8080
- # scheme: HTTP
- # initialDelaySeconds: 0
- # periodSeconds: 30
- # successThreshold: 1
- # timeoutSeconds: 10
- # readinessProbe:
- # failureThreshold: 3
- # httpGet:
- # path: /q/health/ready
- # port: 8080
- # scheme: HTTP
- # initialDelaySeconds: 0
- # periodSeconds: 30
- # successThreshold: 1
- # timeoutSeconds: 10
volumes:
- name: karavan-data
persistentVolumeClaim:
diff --git a/karavan-cloud/openshift/karavan-secret.yaml b/karavan-cloud/openshift/karavan-secret.yaml
index eeab943..4974102 100644
--- a/karavan-cloud/openshift/karavan-secret.yaml
+++ b/karavan-cloud/openshift/karavan-secret.yaml
@@ -5,6 +5,8 @@ metadata:
type: Opaque
stringData:
master-password: karavan
+ oidc-secret: XXXXX
+ oidc-server-url: https://localhost/realms/karavan
projects-git-repository: https://github.com/mgubaidullin/karavan-demo.git
projects-git-password: demo
projects-git-username: demo
diff --git a/karavan-cloud/openshift/kustomization.yaml b/karavan-cloud/openshift/kustomization.yaml
index 0b9790d..3aebc71 100644
--- a/karavan-cloud/openshift/kustomization.yaml
+++ b/karavan-cloud/openshift/kustomization.yaml
@@ -7,4 +7,4 @@ resources:
- karavan-secret.yaml
- karavan-quarkus-task.yaml
- karavan-quarkus-pipeline.yaml
-- karavan-app.yaml
\ No newline at end of file
+- karavan-app-public.yaml
\ No newline at end of file