Merge pull request #180 from maykinmedia/feature/stable-release-openk…

…lant

🔖 Stable release for Open Klant

charts/openklant/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## 1.5.0-beta.0 (2025-10-01)
+## 1.5.0 (2025-02-05)
+
+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).
+- Added the possibility to add/use a secret with a custom name for the django-setup-configuration job.
+
+## 1.5.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/openklant/Chart.yaml

@@ -3,8 +3,8 @@ name: openklant
 description: Project dat de Klanten API | https://klanten-api.vng.cloud en Contactmomenten API | https://contactmomenten-api.vng.cloud/ in een enkel component combineert.
 
 type: application
-version: 1.5.0-beta.0
-appVersion: latest
+version: 1.5.0
+appVersion: 2.5.0
 
 dependencies:
   - name: redis

charts/openklant/README.md

@@ -1,6 +1,6 @@
 # openklant
 
-![Version: 1.5.0-beta.0](https://img.shields.io/badge/Version-1.5.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.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
 
 Project dat de Klanten API | https://klanten-api.vng.cloud en Contactmomenten API | https://contactmomenten-api.vng.cloud/ in een enkel component combineert.
 
@@ -33,6 +33,8 @@ Project dat de Klanten API | https://klanten-api.vng.cloud en Contactmomenten AP
 | 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` |  |
 | extraEnvVars | list | `[]` | Array with extra environment variables to add |
 | extraIngress | list | `[]` | Specify extra ingresses, for example if you have multiple ingress classes |

charts/openklant/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 "openklant.fullname" . }}-config-secrets
+  name: {{ .Values.configurationSecretsName | default (printf "%s-config-secrets" (include "openklant.fullname" .)) }}
   labels:
     {{- include "openklant.labels" . | nindent 4 }}
 stringData:

charts/openklant/templates/job-config.yaml

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

charts/openklant/values.yaml

@@ -28,6 +28,54 @@ configuration:
       #   memory: 128Mi
   secrets: {}
   data: ""
+  # e.g.
+  # data: |-
+      # tokenauth_config_enable: true
+      # tokenauth:
+      #   items:
+      #     - identifier: openinwoner-token
+      #       token: ${openklant_openinwoner_token}
+      #       contact_person: Person 1
+      #       email: [email protected]
+      #       organization: Organization XYZ
+      #       application: Application XYZ
+      #       administration: Administration XYZ
+      # oidc_db_config_enable: True
+      # oidc_db_config_admin_auth:
+      #   items:
+      #   - identifier: admin-oidc
+      #     enabled: True
+      #     oidc_rp_client_id: openklant.example.nl
+      #     oidc_rp_client_secret: ${keycloak_client_secret}
+      #     oidc_rp_scopes_list:
+      #     - openid
+      #     - email
+      #     - profile
+      #     - roles
+      #     oidc_rp_sign_algo: RS256
+      #     endpoint_config:
+      #       oidc_op_discovery_endpoint: https://keycloak.example.nl/realms/example/
+      #     username_claim:
+      #     - sub
+      #     groups_claim:
+      #     - roles
+      #     claim_mapping:
+      #       first_name:
+      #       - given_name
+      #       last_name:
+      #       - family_name
+      #       email:
+      #       - email
+      #     sync_groups: true
+      #     sync_groups_glob_pattern: "*"
+      #     default_groups: []
+      #     make_users_staff: true
+      #     superuser_group_names:
+      #     - Superuser
+      #     oidc_use_nonce: true
+      #     oidc_nonce_size: 32
+      #     oidc_state_size: 32
+      #     userinfo_claims_source: id_token
 
 tags:
   redis: true
@@ -151,6 +199,10 @@ affinity: {}
 
 # 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