Commit triggered by a change on the main branch of helm-charts-dev

EOEPCA · Feb 12, 2024 · 629001e · 629001e
1 parent d28a3cf
commit 629001e
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 25 deletions.
diff --git a/charts/identity-service/Chart.lock b/charts/identity-service/Chart.lock
@@ -1,15 +1,15 @@
 dependencies:
 - name: identity-keycloak
   repository: ""
-  version: 0.15.1
+  version: 0.15.2
 - name: identity-postgres
   repository: ""
-  version: 1.0.1
+  version: 1.0.2
 - name: identity-api
   repository: ""
-  version: 1.0.1
+  version: 1.0.2
 - name: identity-gatekeeper
   repository: https://eoepca.github.io/helm-charts/
-  version: 1.0.8
-digest: sha256:284936aa37eaae5b7df3f5451171edd81e55262ceb9d30d5d75255dff73ac0d4
-generated: "2024-01-14T16:23:28.19011089Z"
+  version: 1.0.9
+digest: sha256:86d269aa6e905f2de9ba6eb26b37a4724734d366d6bf65d77488f8e78b5143f7
+generated: "2024-02-12T15:48:24.344196919Z"
diff --git a/charts/identity-service/Chart.yaml b/charts/identity-service/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.90
+version: 1.0.91
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -26,15 +26,15 @@ appVersion: "v1"
 dependencies:
   - name: identity-keycloak
     condition: identity-keycloak.enabled
-    version: 0.15.1
+    version: 0.15.2
   - name: identity-postgres
     condition: identity-postgres.enabled
-    version: 1.0.1
+    version: 1.0.2
   - name: identity-api
     condition: identity-api.enabled
-    version: 1.0.1
+    version: 1.0.2
   - name: identity-gatekeeper
     condition: identity-gatekeeper.enabled
-    version: 1.0.8
+    version: 1.0.9
     repository: "https://eoepca.github.io/helm-charts/"
     alias: identity-api-gatekeeper
diff --git a/charts/identity-service/charts/identity-api/Chart.yaml b/charts/identity-service/charts/identity-api/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 1.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/identity-service/charts/identity-api/templates/configmap.yaml b/charts/identity-service/charts/identity-api/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.configMap.authServerUrl -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -6,4 +7,5 @@ metadata:
     {{- include "identity-api.labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
 data:
-  AUTH_SERVER_URL: "{{ .Values.configMap.authServerUrl }}"
+  AUTH_SERVER_URL: "{{ .Values.configMap.authServerUrl }}"
+{{- end }}
diff --git a/charts/identity-service/charts/identity-api/templates/deployment.yaml b/charts/identity-service/charts/identity-api/templates/deployment.yaml
@@ -37,9 +37,7 @@ spec:
           args:
             {{- toYaml .Values.deployment.args | nindent 12 }}
           env:
-            {{- with .Values.deployment.extraEnv }}
-            {{- tpl . $ | nindent 12 }}
-            {{- end }}
+            {{- tpl (toYaml .Values.deployment.extraEnv) $ | nindent 12 }}
           envFrom:
             {{- with .Values.deployment.extraEnvFrom }}
             {{- tpl . $ | nindent 12 }}

diff --git a/charts/identity-service/charts/identity-api/templates/secret.yaml b/charts/identity-service/charts/identity-api/templates/secret.yaml
@@ -8,5 +8,5 @@ metadata:
     {{- include "identity-api.labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
 data:
-  ADMIN_PASSWORD: "{{ .Values.secrets.adminPassword }}"
+  ADMIN_PASSWORD: "{{ .Values.secrets.adminPassword | b64enc }}"
 {{- end }}
diff --git a/charts/identity-service/charts/identity-api/values.yaml b/charts/identity-service/charts/identity-api/values.yaml
@@ -145,7 +145,7 @@ serviceAccount:
   name: ""
 
 configMap:
-  authServerUrl: https://identity.keycloak.myplatform.eoepca.org
+  # authServerUrl: https://identity.keycloak.myplatform.eoepca.org
 
 secrets:
-  adminPassword: ""
+  # adminPassword: "changeme"
diff --git a/charts/identity-service/charts/identity-keycloak/Chart.yaml b/charts/identity-service/charts/identity-keycloak/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.15.1
+version: 0.15.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/identity-service/charts/identity-keycloak/templates/secret.yaml b/charts/identity-service/charts/identity-keycloak/templates/secret.yaml
@@ -8,6 +8,6 @@ metadata:
     {{- include "identity-keycloak.labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
 data:
-  KC_DB_PASSWORD: "{{ .Values.secrets.kcDbPassword }}"
-  KEYCLOAK_ADMIN_PASSWORD: "{{ .Values.secrets.keycloakAdminPassword }}"
+  KC_DB_PASSWORD: "{{ .Values.secrets.kcDbPassword | b64enc }}"
+  KEYCLOAK_ADMIN_PASSWORD: "{{ .Values.secrets.keycloakAdminPassword | b64enc }}"
 {{- end }}
diff --git a/charts/identity-service/charts/identity-postgres/Chart.yaml b/charts/identity-service/charts/identity-postgres/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 1.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/identity-service/charts/identity-postgres/templates/secret.yaml b/charts/identity-service/charts/identity-postgres/templates/secret.yaml
@@ -8,6 +8,6 @@ metadata:
     {{- include "identity-postgres.labels" . | nindent 4 }}
   namespace: {{ .Release.Namespace }}
 data:
-  POSTGRES_PASSWORD: "{{ .Values.secrets.postgresPassword }}"
-  PGPASSWORD: "{{ .Values.secrets.pgPassword }}"
+  POSTGRES_PASSWORD: "{{ .Values.secrets.postgresPassword | b64enc }}"
+  PGPASSWORD: "{{ .Values.secrets.pgPassword | b64enc }}"
 {{- end }}
diff --git a/charts/identity-service/values.yaml b/charts/identity-service/values.yaml
@@ -18,3 +18,10 @@ identity-api:
       pullPolicy: IfNotPresent
 identity-api-gatekeeper:
   enabled: true
+  ingress:
+    serverSnippets:
+      custom: |-
+        # Additional snippet for open access to the Swagger UI of the identity-api
+        location ~ /(docs|openapi.json) {
+          proxy_pass {{ include "identity-gatekeeper.targetUrl" . }}$request_uri;
+        }