Merge pull request #175 from maykinmedia/feature/stable-release-compo…

…nents

🔖 Stable release for OpenForms

charts/openforms/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## 1.8.0-beta.0 (2025-10-01)
+## 1.8.0 (2025-01-29)
+
+Stable release with support of [django-setup-configuration](https://github.com/maykinmedia/django-setup-configuration). 
+
+- Fixed the configuration-secrets.yaml template to render only if no existing secret is present in the cluster (needed for example if using sealed secrets).
+
+## 1.8.0-beta.0 (2025-01-10)
 
 - [#148] Replace the worker liveness probe with the `celery inspect active` command. This should detect when a worker is down and should not interrupt long running tasks.
 - [#119] Update the syntax of the worker liveness probe. The worker probes now can be enabled/disabled with:

charts/openforms/Chart.yaml

@@ -3,8 +3,8 @@ name: openforms
 description: Snel en eenvoudig slimme formulieren bouwen en publiceren
 
 type: application
-version: 1.8.0-beta.0
-appVersion: latest
+version: 1.8.0
+appVersion: 3.0.1
 icon: https://open-forms.readthedocs.io/en/stable/_static/logo.svg
 
 dependencies:

charts/openforms/README.md

@@ -1,6 +1,6 @@
 # openforms
 
-![Version: 1.8.0-beta.0](https://img.shields.io/badge/Version-1.8.0--beta.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.1](https://img.shields.io/badge/AppVersion-3.0.1-informational?style=flat-square)
 
 Snel en eenvoudig slimme formulieren bouwen en publiceren
 
@@ -35,6 +35,8 @@ Snel en eenvoudig slimme formulieren bouwen en publiceren
 | configuration.job.restartPolicy | string | `"OnFailure"` |  |
 | configuration.job.ttlSecondsAfterFinished | int | `0` | 0 Will clean the job after it is finished |
 | configuration.secrets | object | `{}` |  |
+| configurationSecretsName | string | `""` |  |
+| existingConfigurationSecrets | string | `nil` |  |
 | existingSecret | string | `nil` |  |
 | extraDeploy | list | `[]` |  |
 | extraEnvVars | list | `[]` |  |

charts/openforms/templates/configuration-secrets.yaml

@@ -1,8 +1,8 @@
-{{- if and .Values.global.configuration.enabled .Values.configuration.enabled}}
+{{- if and (not .Values.existingConfigurationSecrets) .Values.global.configuration.enabled .Values.configuration.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "openforms.fullname" . }}-config-secrets
+  name: {{ .Values.configurationSecretsName | default (printf "%s-config-secrets" (include "openforms.fullname" .)) }}
   labels:
     {{- include "openforms.labels" . | nindent 4 }}
 stringData:

charts/openforms/templates/job-config.yaml

@@ -38,7 +38,7 @@ spec:
             - secretRef:
                 name: {{ .Values.existingSecret | default (include "openforms.fullname" .) }}
             - secretRef:
-                name: {{ include "openforms.fullname" . }}-config-secrets                
+                name: {{ if .Values.existingConfigurationSecrets }}{{ .Values.existingConfigurationSecrets }}{{ else }}{{ .Values.configurationSecretsName | default (printf "%s-config-secrets" (include "openforms.fullname" .)) }}{{ end }}                
             - configMapRef:
                 name: {{ include "openforms.fullname" . }}
           env:

charts/openforms/values.yaml

@@ -32,6 +32,7 @@ configuration:
     # objecten_test_token: Token 171be5abaf41e7856b423ad513df1ef8f867ff48
     # documenten_test_secret: documenten_supersecret
     # catalogi_test_secret: catalogi_supersecret
+    # keycloak_client_secret: keycloak_supersecret
   # data: ""
   # e.g.
   # data: |-
@@ -41,7 +42,7 @@ configuration:
   #     - identifier: admin-oidc
   #       enabled: True
   #       oidc_rp_client_id: testid
-  #       oidc_rp_client_secret: 7DB3KUAAizYCcmZufpHRVOcD0TOkNO3I
+  #       oidc_rp_client_secret: ${keycloak_client_secret}
   #       oidc_rp_scopes_list:
   #       - openid
   #       - email
@@ -77,31 +78,27 @@ configuration:
   #       auth_type: api_key
   #       header_key: Authorization
   #       header_value: '${objecttypen_test_token}'
-
   #     - identifier: objecten-test
   #       label: Objecten API test
   #       api_root: http://objects.example.com/api/v2/
   #       api_type: orc
   #       auth_type: api_key
   #       header_key: Authorization
   #       header_value: '${objecten_test_token}'
-
   #     - identifier: documenten-test
   #       label: Documenten API test
   #       api_root: http://openzaak-web.example.com/documenten/api/v1/
   #       api_type: drc
   #       auth_type: zgw
   #       client_id: test_client_id
   #       secret: '${documenten_test_secret}'
-
   #     - identifier: catalogi-test
   #       label: Catalogi API test
   #       api_root: http://openzaak-web.example.com/catalogi/api/v1/
   #       api_type: ztc
   #       auth_type: zgw
   #       client_id: test_client_id
   #       secret: '${catalogi_test_secret}'
-
   #   objects_api_config_enable: True
   #   objects_api:
   #     groups:
@@ -258,6 +255,10 @@ persistence:
 
 # Existing Secret must be defined for AzureVaultSecret to work
 existingSecret: null
+# Reference to an existing secret with the values needed for django-setup-configuration
+existingConfigurationSecrets: null
+# If no secret already exists with the values needed for django-setup-configuration, create it with the following name
+configurationSecretsName: ""
 
 # This will create an AzureVaultSecret object in k8s, only Multi Key Value Secret are supported by this chart
 # ref: https://akv2k8s.io/tutorials/sync/4-multi-key-value-secret/ https://learn.microsoft.com/en-us/azure/key-vault/secrets/multiline-secrets