From fe4c36f2f157bb69cb19b60be11452f45099ccc4 Mon Sep 17 00:00:00 2001 From: Amro Misbah Date: Thu, 18 Apr 2024 19:23:43 +0200 Subject: [PATCH 1/3] fix: add missing couchbase cb-pass volume Signed-off-by: Amro Misbah --- .../auth-server-key-rotation/templates/cronjobs.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/charts/janssen/charts/auth-server-key-rotation/templates/cronjobs.yaml b/charts/janssen/charts/auth-server-key-rotation/templates/cronjobs.yaml index 9f44f89e6cf..26a00230ddc 100644 --- a/charts/janssen/charts/auth-server-key-rotation/templates/cronjobs.yaml +++ b/charts/janssen/charts/auth-server-key-rotation/templates/cronjobs.yaml @@ -165,6 +165,13 @@ spec: secret: secretName: {{ .Release.Name }}-cb-crt {{- end }} + - name: cb-pass + secret: + secretName: {{ .Release.Name }}-cb-pass + items: + # we are mostly need non-superuser couchbase password file here + - key: couchbase_password + path: couchbase_password {{- end }} {{- if or (eq .Values.global.cnPersistenceType "sql") (eq .Values.global.cnPersistenceType "hybrid") }} - name: sql-pass From 8c2c6d90f15cb25ec19856e50770d36001122e0e Mon Sep 17 00:00:00 2001 From: iromli Date: Fri, 19 Apr 2024 05:12:48 +0700 Subject: [PATCH 2/3] fix(charts): add missing volume for couchbase access Signed-off-by: iromli --- charts/janssen-all-in-one/templates/deployment.yml | 6 +++++- charts/janssen/charts/config/templates/load-init-config.yml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/charts/janssen-all-in-one/templates/deployment.yml b/charts/janssen-all-in-one/templates/deployment.yml index 2e23a0e89f8..c4e402224c0 100644 --- a/charts/janssen-all-in-one/templates/deployment.yml +++ b/charts/janssen-all-in-one/templates/deployment.yml @@ -131,6 +131,9 @@ spec: - name: cb-pass mountPath: {{ .Values.cnCouchbasePasswordFile }} subPath: couchbase_password + - name: cb-pass + mountPath: {{ .Values.cnCouchbaseSuperuserPasswordFile }} + subPath: couchbase_superuser_password {{- end }} {{- if or (eq .Values.cnPersistenceType "sql") (eq .Values.cnPersistenceType "hybrid") }} - name: sql-pass @@ -214,9 +217,10 @@ spec: secret: secretName: {{ .Release.Name }}-cb-pass items: - # we are mostly need non-superuser couchbase password file here - key: couchbase_password path: couchbase_password + - key: couchbase_superuser_password + path: couchbase_superuser_password {{- end }} {{- if not .Values.isFqdnRegistered }} - name: {{ include "janssen-all-in-one.fullname" . }}-updatelbip diff --git a/charts/janssen/charts/config/templates/load-init-config.yml b/charts/janssen/charts/config/templates/load-init-config.yml index 9988d9ceb90..dc94fa1da91 100644 --- a/charts/janssen/charts/config/templates/load-init-config.yml +++ b/charts/janssen/charts/config/templates/load-init-config.yml @@ -81,9 +81,10 @@ spec: secret: secretName: {{ .Release.Name }}-cb-pass items: - # we are mostly need non-superuser couchbase password file here - key: couchbase_password path: couchbase_password + - key: couchbase_superuser_password + path: couchbase_superuser_password {{- end }} {{- if or (eq .Values.global.cnPersistenceType "sql") (eq .Values.global.cnPersistenceType "hybrid") }} - name: sql-pass @@ -147,6 +148,9 @@ spec: - name: cb-pass mountPath: {{ .Values.global.cnCouchbasePasswordFile }} subPath: couchbase_password + - name: cb-pass + mountPath: {{ .Values.global.cnCouchbaseSuperuserPasswordFile }} + subPath: couchbase_superuser_password {{- end }} {{- if or (eq .Values.global.cnPersistenceType "ldap") (eq .Values.global.cnPersistenceType "hybrid") }} - name: ldap-pass From df50ded591c6e507ac3c9e48ebaf0c61a28853bf Mon Sep 17 00:00:00 2001 From: iromli Date: Fri, 19 Apr 2024 14:59:47 +0700 Subject: [PATCH 3/3] chore: update jans-pycloudlib version Signed-off-by: iromli --- docker-jans-all-in-one/app/requirements.txt | 2 +- docker-jans-auth-server/requirements.txt | 2 +- docker-jans-casa/requirements.txt | 2 +- docker-jans-certmanager/requirements.txt | 2 +- docker-jans-config-api/requirements.txt | 2 +- docker-jans-configurator/requirements.txt | 2 +- docker-jans-fido2/requirements.txt | 2 +- docker-jans-keycloak-link/requirements.txt | 2 +- docker-jans-link/requirements.txt | 2 +- docker-jans-persistence-loader/requirements.txt | 2 +- docker-jans-saml/requirements.txt | 2 +- docker-jans-scim/requirements.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docker-jans-all-in-one/app/requirements.txt b/docker-jans-all-in-one/app/requirements.txt index 1d5efe0feb1..b9eef320072 100644 --- a/docker-jans-all-in-one/app/requirements.txt +++ b/docker-jans-all-in-one/app/requirements.txt @@ -6,4 +6,4 @@ fqdn==1.5.1 ruamel.yaml==0.18.6 supervisor==4.2.5 pluggy==1.4.0 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-auth-server/requirements.txt b/docker-jans-auth-server/requirements.txt index a22fec08472..d5d3568520f 100644 --- a/docker-jans-auth-server/requirements.txt +++ b/docker-jans-auth-server/requirements.txt @@ -1,3 +1,3 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-casa/requirements.txt b/docker-jans-casa/requirements.txt index a71611d6d34..efa88c17be6 100644 --- a/docker-jans-casa/requirements.txt +++ b/docker-jans-casa/requirements.txt @@ -1,4 +1,4 @@ webdavclient3>=3.14.5 # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-certmanager/requirements.txt b/docker-jans-certmanager/requirements.txt index 1a34ef11ccb..919ab269a60 100644 --- a/docker-jans-certmanager/requirements.txt +++ b/docker-jans-certmanager/requirements.txt @@ -1,4 +1,4 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 click==8.1.7 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-config-api/requirements.txt b/docker-jans-config-api/requirements.txt index a22fec08472..d5d3568520f 100644 --- a/docker-jans-config-api/requirements.txt +++ b/docker-jans-config-api/requirements.txt @@ -1,3 +1,3 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-configurator/requirements.txt b/docker-jans-configurator/requirements.txt index 56967c995e8..0305a309245 100644 --- a/docker-jans-configurator/requirements.txt +++ b/docker-jans-configurator/requirements.txt @@ -3,4 +3,4 @@ grpcio==1.54.2 click==8.1.7 marshmallow==3.21.1 fqdn==1.5.1 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-fido2/requirements.txt b/docker-jans-fido2/requirements.txt index a22fec08472..d5d3568520f 100644 --- a/docker-jans-fido2/requirements.txt +++ b/docker-jans-fido2/requirements.txt @@ -1,3 +1,3 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-keycloak-link/requirements.txt b/docker-jans-keycloak-link/requirements.txt index a22fec08472..d5d3568520f 100644 --- a/docker-jans-keycloak-link/requirements.txt +++ b/docker-jans-keycloak-link/requirements.txt @@ -1,3 +1,3 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-link/requirements.txt b/docker-jans-link/requirements.txt index a22fec08472..d5d3568520f 100644 --- a/docker-jans-link/requirements.txt +++ b/docker-jans-link/requirements.txt @@ -1,3 +1,3 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-persistence-loader/requirements.txt b/docker-jans-persistence-loader/requirements.txt index a22fec08472..d5d3568520f 100644 --- a/docker-jans-persistence-loader/requirements.txt +++ b/docker-jans-persistence-loader/requirements.txt @@ -1,3 +1,3 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-saml/requirements.txt b/docker-jans-saml/requirements.txt index a22fec08472..d5d3568520f 100644 --- a/docker-jans-saml/requirements.txt +++ b/docker-jans-saml/requirements.txt @@ -1,3 +1,3 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib diff --git a/docker-jans-scim/requirements.txt b/docker-jans-scim/requirements.txt index 501915c5370..2be46f6b6d4 100644 --- a/docker-jans-scim/requirements.txt +++ b/docker-jans-scim/requirements.txt @@ -1,4 +1,4 @@ # pinned to py3-grpcio version to avoid failure on native extension build grpcio==1.54.2 ruamel.yaml==0.18.6 -git+https://github.com/JanssenProject/jans@21e4cc39e71d78d35a01aa3143bfd3a3d2657047#egg=jans-pycloudlib&subdirectory=jans-pycloudlib +git+https://github.com/JanssenProject/jans@09ca1d7578c2ae1221b06576a380390ed92654ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib