Skip to content

Commit 716987f

Browse files
committed
Merge remote-tracking branch 'origin/feature/3.x-helm-charts' into feature/3.x-helm-charts
2 parents a0ab776 + 914fa5c commit 716987f

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

  • charts
    • nl-portal-backend/nl-portal-backend
    • nl-portal-configpanel-frontend/nl-portal-configpanel-frontend

charts/nl-portal-backend/nl-portal-backend/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Kubernetes: `>=1.23.0`
6464
| serviceAccount.annotations | object | `{}` | |
6565
| serviceAccount.create | bool | `true` | |
6666
| serviceAccount.name | string | `""` | |
67-
| settings | object | `{"app":{"features":{"configurationPanel":{"applicationName":"","enabled":false,"token":null,"uri":""}},"logLevel":"INFO","security":{"cors":{"config":{"allowedHeaders":"","allowedMethods":"","allowedOrigins":""},"path":""},"endpoints":{"unsecured":""}}},"database":{"password":"","url":null,"username":"nlportal"},"keycloak":{"audience":null,"clientID":null,"httpRelativePath":null,"realm":null,"token_exchange_secret":null,"url":null,"version":null},"services":{"authentication":{"machtingsdienst":{"resourceUrl":""}},"berichten":{"enabled":false,"properties":{"berichtObjectTypeUrl":""}},"besluitenapi":{"enabled":false,"properties":{"clientId":"","secret":"","url":""}},"catalogiapi":{"enabled":false,"properties":{"clientId":"","documentTypeUrl":"","rsin":"","secret":"","url":""}},"dmn":{"enabled":false,"properties":{"url":""}},"documentenapis":{"enabled":false,"properties":{"configurations":{"dummydoc":{"clientId":"","secret":"","url":""},"openzaak":{"clientId":"","documentTypeUrl":"","rsin":"","secret":"","url":""}},"defaultDocumentApi":""}},"haalcentraal2":{"enabled":false,"properties":{"bewoningApiUrl":"","brpApiUrl":""}},"haalcentraal_brp":{"enabled":false,"properties":{"apiKey":"","ssl":{"enabled":false,"key":{"certChain":"","key":"","keyPassword":""},"trustedCertificate":""},"url":""}},"haalcentraal_hr":{"enabled":false,"properties":{"apiKey":"","ssl":{"enabled":false,"key":{"certChain":"","key":"","keyPassword":""},"trustedCertificate":""},"url":""}},"objectenapi":{"enabled":false,"properties":{"token":"","url":""}},"openklant":{"enabled":false,"properties":{"clientId":"","secret":"","url":""}},"openklant2":{"enabled":false,"properties":{"contactgegevensApiUrl":"","klantinteractiesApiUrl":"","token":""}},"openproduct":{"enabled":false,"properties":{"dmn":{"clientId":"","password":"","secret":"","username":""},"productApiUrl":"","productTypeApiUrl":"","token":""}},"payment":{"direct":{"enabled":false,"properties":{"configurations":{"belastingzaken":{"apiKey":"","apiSecret":"","language":"","pspId":"","returnUrl":"","webhookApiKey":"","webhookApiSecret":""}},"shaOutParameters":"","url":""}},"ogone":{"enabled":false,"properties":{"configurations":{"belastingzaken":{"failureUrl":"","pspId":"","shaInKey":"","shaOutKey":"","successUrl":"","title":""}},"shaOutParameters":"","url":""}}},"prefill":{"enabled":false,"properties":{"typeUrl":""}},"product":{"enabled":false,"properties":{"productDetailsTypeUrl":"","productInstantieTypeUrl":"","productTypeUrl":"","productVerbruiksObjectTypeUrl":""}},"taak":{"enabled":false,"properties":{"typeUrl":"","typeUrlV2":""}},"virusscan":{"clamav":{"enabled":false,"properties":{"hostname":""}}},"zakenapi":{"enabled":false,"properties":{"clientId":"","secret":"","url":"","zaakdocumentenConfig":{"statusWhitelist":"","vertouwelijkheidsaanduidingWhitelist":"","vertrouwelijkheidsaanduidingWhitelist":""}}}},"theme":{"logo":"","style":""}}` | Application Settings |
67+
| settings | object | `{"app":{"features":{"configurationPanel":{"applicationName":"","enabled":false,"token":null,"uri":""}},"logLevel":"INFO","security":{"cors":{"config":{"allowedHeaders":"","allowedMethods":"","allowedOrigins":""},"path":""},"endpoints":{"unsecured":""}}},"database":{"password":"","url":null,"username":"nlportal"},"keycloak":{"audience":null,"clientID":null,"httpRelativePath":null,"realm":null,"token_exchange_secret":null,"url":null,"version":null},"services":{"authentication":{"machtingsdienst":{"resourceUrl":""}},"berichten":{"enabled":false,"properties":{"berichtObjectTypeUrl":""}},"besluitenapi":{"enabled":false,"properties":{"clientId":"","secret":"","url":""}},"catalogiapi":{"enabled":false,"properties":{"clientId":"","documentTypeUrl":"","rsin":"","secret":"","url":""}},"dmn":{"enabled":false,"properties":{"url":""}},"documentenapis":{"enabled":false,"properties":{"configurations":{"dummydoc":{"clientId":"","secret":"","url":""},"openzaak":{"clientId":"","documentTypeUrl":"","rsin":"","secret":"","url":""}},"defaultDocumentApi":""}},"haalcentraal2":{"enabled":false,"properties":{"bewoningApiUrl":"","brpApiUrl":""}},"haalcentraal_brp":{"enabled":false,"properties":{"apiKey":"","ssl":{"enabled":false,"key":{"certChain":"","key":"","keyPassword":""},"trustedCertificate":""},"url":""}},"haalcentraal_hr":{"enabled":false,"properties":{"apiKey":"","ssl":{"enabled":false,"key":{"certChain":"","key":"","keyPassword":""},"trustedCertificate":""},"url":""}},"objectenapi":{"enabled":false,"properties":{"token":"","url":""}},"openklant":{"enabled":false,"properties":{"clientId":"","secret":"","url":""}},"openklant2":{"enabled":false,"properties":{"contactgegevensApiUrl":"","klantinteractiesApiUrl":"","token":""}},"openproduct":{"enabled":false,"properties":{"dmn":{"clientId":"","password":"","secret":"","username":""},"productApiUrl":"","productTypeApiUrl":"","token":""}},"payment":{"direct":{"enabled":false,"properties":{"configurations":{"belastingzaken":{"apiKey":"","apiSecret":"","language":"","pspId":"","returnUrl":"","webhookApiKey":"","webhookApiSecret":""}},"shaOutParameters":"","url":""}},"ogone":{"enabled":false,"properties":{"configurations":{"belastingzaken":{"failureUrl":"","pspId":"","shaInKey":"","shaOutKey":"","successUrl":"","title":""}},"shaOutParameters":"","url":""}}},"prefill":{"enabled":false,"properties":{"typeUrl":""}},"product":{"enabled":false,"properties":{"productDetailsTypeUrl":"","productInstantieTypeUrl":"","productTypeUrl":"","productVerbruiksObjectTypeUrl":""}},"taak":{"enabled":false,"properties":{"typeUrl":"","typeUrlV2":""}},"virusscan":{"clamav":{"enabled":false,"properties":{"hostname":""}}},"zakenapi":{"enabled":false,"properties":{"clientId":"","secret":"","url":"","zaakdocumentenConfig":{"statusWhitelist":"","vertrouwelijkheidsaanduidingWhitelist":""}}}},"theme":{"logo":"","style":""}}` | Application Settings |
6868
| settings.app.features.configurationPanel.token | string | `nil` | If using existingSecret, set via key: CONFIGURATION_PANEL_TOKEN |
6969
| settings.app.logLevel | string | `"INFO"` | TODO: what log levels are there? |
7070
| settings.app.security | object | `{"cors":{"config":{"allowedHeaders":"","allowedMethods":"","allowedOrigins":""},"path":""},"endpoints":{"unsecured":""}}` | CORS configuration |
@@ -104,7 +104,6 @@ Kubernetes: `>=1.23.0`
104104
| settings.services.payment.ogone.properties.configurations.belastingzaken.shaOutKey | string | `""` | If using existingSecret, set via key: NLPORTAL_CONFIG_PAYMENT_OGONE_PROPERTIES_CONFIGURATIONS_BELASTINGZAKEN_SHAOUTKEY |
105105
| settings.services.payment.ogone.properties.shaOutParameters | string | `""` | If using existingSecret, set via key: NLPORTAL_CONFIG_PAYMENT_OGONE_PROPERTIES_SHAOUTPARAMETERS |
106106
| settings.services.zakenapi.properties.secret | string | `""` | If using existingSecret, set via key: NLPORTAL_CONFIG_ZAKENAPI_PROPERTIES_SECRET |
107-
| settings.services.zakenapi.properties.zaakdocumentenConfig.vertouwelijkheidsaanduidingWhitelist | string | `""` | DEPRECATED: misspelled alias of `vertrouwelijkheidsaanduidingWhitelist`, kept for backwards compatibility. Will be removed in a future major version. |
108107
| startupProbe.failureThreshold | int | `90` | |
109108
| startupProbe.httpGet.path | string | `"/actuator/health"` | |
110109
| startupProbe.httpGet.port | string | `"http"` | |

charts/nl-portal-configpanel-frontend/nl-portal-configpanel-frontend/README.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# nl-portal-configpanel-frontend
22

3-
![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
3+
![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
44

55
NL-Portal Configuration Panel Helm chart to be used in Kubernetes clusters.
66

7+
## Requirements
8+
9+
Kubernetes: `>=1.23.0`
10+
711
## Values
812

913
| Key | Type | Default | Description |
@@ -19,20 +23,20 @@ NL-Portal Configuration Panel Helm chart to be used in Kubernetes clusters.
1923
| fullnameOverride | string | `""` | |
2024
| image.pullPolicy | string | `"IfNotPresent"` | |
2125
| image.repository | string | `"ghcr.io/nl-portal/configuration-panel-frontend"` | |
22-
| image.tag | string | `"latest"` | Overrides the image tag whose default is the chart appVersion. |
26+
| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
2327
| imagePullSecrets | list | `[]` | |
2428
| ingress.annotations | object | `{}` | |
2529
| ingress.className | string | `""` | |
2630
| ingress.enabled | bool | `false` | |
27-
| ingress.host | string | `"nl-portal-config-panel.example.com"` | |
31+
| ingress.hosts[0] | string | `"nl-portal-config-panel.example.com"` | |
2832
| ingress.tls | list | `[]` | |
29-
| livenessProbe | object | `{"failureThreshold":6,"httpGet":{"path":"/","port":8080},"initialDelaySeconds":40,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Liveness probe for container health checking |
33+
| livenessProbe | object | `{"failureThreshold":6,"httpGet":{"path":"/","port":"http"},"initialDelaySeconds":5,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Liveness probe for container health checking |
3034
| nameOverride | string | `""` | |
3135
| nodeSelector | object | `{}` | |
3236
| podAnnotations | object | `{}` | |
3337
| podLabels | object | `{}` | |
3438
| podSecurityContext | object | `{}` | |
35-
| readinessProbe | object | `{"failureThreshold":6,"httpGet":{"path":"/","port":8080},"initialDelaySeconds":20,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Readiness probe for container health checking |
39+
| readinessProbe | object | `{"failureThreshold":6,"httpGet":{"path":"/","port":"http"},"initialDelaySeconds":5,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Readiness probe for container health checking |
3640
| replicaCount | int | `1` | |
3741
| resources | object | `{}` | Resource requests and limits |
3842
| securityContext | object | `{}` | |
@@ -42,13 +46,14 @@ NL-Portal Configuration Panel Helm chart to be used in Kubernetes clusters.
4246
| serviceAccount.annotations | object | `{}` | |
4347
| serviceAccount.create | bool | `true` | |
4448
| serviceAccount.name | string | `""` | |
45-
| settings | object | `{"app":{"configPanelRestUrl":""},"oidc":{"clientApplicationName":"","clientId":"","postLogoutRedirectUrl":"","redirectUrl":"","url":""}}` | Application Settings |
46-
| settings.app.configPanelRestUrl | string | `""` | Set to the base URL of the backend REST API should the backend and frontend be running on different hosts without routing. |
47-
| settings.oidc.clientApplicationName | string | `""` | Required: The name of the Spring Boot application whose configuration is being provided by this application. Example: nl-portal-app. |
49+
| settings | object | `{"app":{"clientApplicationName":"","configPanelRestApiUrl":""},"oidc":{"clientId":"","postLogoutRedirectUrl":"","redirectUrl":"","url":""}}` | Application Settings |
50+
| settings.app.clientApplicationName | string | `""` | Required: The name of the Spring Boot application whose configuration is being provided by this application. Example: nl-portal-app. |
51+
| settings.app.configPanelRestApiUrl | string | `""` | Required: Set to the base URL of the backend REST API should the backend and frontend be running on different hosts without routing. |
4852
| settings.oidc.clientId | string | `""` | Required: The Client ID of the client that will be used for the authentication flow at the OIDC Authority. |
4953
| settings.oidc.postLogoutRedirectUrl | string | `""` | Required: The post logout target URL where the OIDC Authority should redirect the user. |
5054
| settings.oidc.redirectUrl | string | `""` | Required: The post authentication target URL where the OIDC Authority should redirect the user. Should be set to the base URL of this application. |
5155
| settings.oidc.url | string | `""` | Required: OIDC Authority/Oauth2 Provider URL. |
56+
| startupProbe | object | `{"failureThreshold":30,"httpGet":{"path":"/","port":"http"},"periodSeconds":10}` | Startup probe for container initialization checking |
5257
| tolerations | list | `[]` | |
5358

5459
----------------------------------------------

0 commit comments

Comments
 (0)