Merge branch 'master' into OpenZaak_ZGW_API

.github/workflows/ci-build.yml

@@ -26,7 +26,7 @@ jobs:
         node-version: 18.x
     - 
       name: Install dependencies
-      run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer conventional-changelog-conventionalcommits
+      run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer conventional-changelog-conventionalcommits semantic-release-helm
     -
       name: Get next version
       id: next-version
@@ -110,7 +110,7 @@ jobs:
         node-version: 18.x
     - 
       name: Install dependencies
-      run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer conventional-changelog-conventionalcommits
+      run: yarn global add semantic-release @semantic-release/changelog @semantic-release/git @semantic-release/github @semantic-release/exec @semantic-release/release-notes-generator @semantic-release/commit-analyzer conventional-changelog-conventionalcommits semantic-release-helm
     - 
       name: Semantic Release
       run: "semantic-release"

.github/workflows/create-base-image.yml

@@ -0,0 +1,28 @@
+name: "Create base image"
+on: 
+  workflow_dispatch:
+
+env:
+  FF_IMAGE: nexus.frankframework.org/frank-framework
+  FF_VERSION: 7.9-SNAPSHOT
+  BASE_IMAGE: docker.io/wearefrank/zaakbrug-base
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to Container Registry
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Pull Frank!Framework image
+        run: docker pull $FF_IMAGE:$FF_VERSION
+      - name: Tag Frank!Framework image latest
+        run: docker tag $FF_IMAGE:$FF_VERSION $BASE_IMAGE:latest
+      - name: Tag Frank!Framework image with same tag
+        run: docker tag $FF_IMAGE:$FF_VERSION $BASE_IMAGE:$FF_VERSION
+      - name: Tag Frank!Framework image with hash
+        run: docker tag $FF_IMAGE:$FF_VERSION $BASE_IMAGE:${{ github.run_id }}
+      - name: Push Docker image
+        run: docker push $BASE_IMAGE --all-tags

.github/workflows/docker-build-and-push-workflow.yml

@@ -73,6 +73,7 @@ jobs:
       with:
         name: docker
         path: /tmp/docker.tar
+        retention-days: 1
     outputs:
       docker-meta-tags: ${{ steps.meta.outputs.tags }}
       docker-meta-labels: ${{ steps.meta.outputs.labels }}

.releaserc

@@ -20,22 +20,26 @@
           {"type": "ci", "release": "patch"},
           {"type": "chore", "release": false}
         ],
-        "parserOpts": [
-          "BREAKING CHANGE",
-          "BREAKING CHANGES",
-          "BREAKING"
-        ]
+        "parserOpts": {
+          "noteKeywords": [
+            "BREAKING CHANGE",
+            "BREAKING CHANGES",
+            "BREAKING"
+          ]
+        }
       }
     ],
     [
       "@semantic-release/release-notes-generator",
       {
         "preset": "conventionalcommits",
-        "parserOpts": [
-          "BREAKING CHANGE",
-          "BREAKING CHANGES",
-          "BREAKING"
-        ],
+        "parserOpts": {
+          "noteKeywords": [
+            "BREAKING CHANGE",
+            "BREAKING CHANGES",
+            "BREAKING"
+          ]
+        },
         "writerOpts": {
           "commitsSort": ["subject", "scope"]
         },
@@ -61,6 +65,12 @@
         "verifyReleaseCmd": "echo '::set-output name=release-tag::v${nextRelease.version}'; echo '::set-output name=release-version::${nextRelease.version}'"
       }
     ],
+    [
+      "semantic-release-helm",
+      {
+        "chartPath": "./charts/zaakbrug"
+      }
+    ],
     [
       "@semantic-release/changelog",
       {
@@ -72,11 +82,12 @@
       "@semantic-release/git",
       {
         "assets": [
-          "CHANGELOG.md"
+          "CHANGELOG.md",
+          "./charts/zaakbrug/Chart.yaml"
         ],
         "message": "chore(<%= nextRelease.type %>): release <%= nextRelease.version %> <%= nextRelease.channel !== null ? `on ${nextRelease.channel} channel ` : '' %>[skip ci]\n\n<%= nextRelease.notes %>"
       }
     ],
     "@semantic-release/github"
   ]
-}
+}

CHANGELOG.md

@@ -1,5 +1,82 @@
 [![conventional commits](https://img.shields.io/badge/conventional%20commits-1.0.0-yellow.svg)](https://conventionalcommits.org) [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org)
 
+## [1.12.21](https://github.com/ibissource/zaakbrug/compare/v1.12.20...v1.12.21) (2023-06-29)
+
+
+### 🧑‍💻 Code Refactoring
+
+* add NGinX reverse proxy to the Helm Chart ([#128](https://github.com/ibissource/zaakbrug/issues/128)) ([660310b](https://github.com/ibissource/zaakbrug/commit/660310b288f9e843fc2f5cf51a63dba6706b5faf))
+
+## [1.12.20](https://github.com/ibissource/zaakbrug/compare/v1.12.19...v1.12.20) (2023-06-26)
+
+
+### 🐛 Bug Fixes
+
+* optional staging is enabled by default ([e54e657](https://github.com/ibissource/zaakbrug/commit/e54e6574a4a7687e60945ae14b5b13506031db3f))
+
+## [1.12.19](https://github.com/ibissource/zaakbrug/compare/v1.12.18...v1.12.19) (2023-06-23)
+
+
+### 🐛 Bug Fixes
+
+* **helm:** tomcatUsers default should be an empty array ([#126](https://github.com/ibissource/zaakbrug/issues/126)) ([b4bfe7e](https://github.com/ibissource/zaakbrug/commit/b4bfe7e2063d42296c1876a8e236b7e4161375d0))
+
+## [1.12.18](https://github.com/ibissource/zaakbrug/compare/v1.12.17...v1.12.18) (2023-06-23)
+
+
+### 🤖 Build System
+
+* lock frank-framework base image to tag instead of snapshot ([#125](https://github.com/ibissource/zaakbrug/issues/125)) ([77b8031](https://github.com/ibissource/zaakbrug/commit/77b803125ab358e82a7871908ebc47b47a41c9f9))
+
+
+### 🔁 Continuous Integration
+
+* add workflow to create a base image for the zaakbrug ([#122](https://github.com/ibissource/zaakbrug/issues/122)) ([b7d1383](https://github.com/ibissource/zaakbrug/commit/b7d13832822564f0033e2d2a36d4a7b96c81e25c))
+* remove docker image artifact automatically after one day ([#123](https://github.com/ibissource/zaakbrug/issues/123)) ([61b8b1d](https://github.com/ibissource/zaakbrug/commit/61b8b1d9c7f52a7368853afd21178df06e410200))
+
+## [1.12.17](https://github.com/ibissource/zaakbrug/compare/v1.12.16...v1.12.17) (2023-06-23)
+
+
+### 🐛 Bug Fixes
+
+* every call to a subadapter is shown as a seperate message in Ladybug ([#121](https://github.com/ibissource/zaakbrug/issues/121)) ([259c444](https://github.com/ibissource/zaakbrug/commit/259c4448e96ca915b64470a080411dfd7490de54))
+
+## [1.12.16](https://github.com/ibissource/zaakbrug/compare/v1.12.15...v1.12.16) (2023-06-22)
+
+
+### 🧑‍💻 Code Refactoring
+
+* add optional staging openzaak deployment to helm for zgw to zds translation ([#104](https://github.com/ibissource/zaakbrug/issues/104)) ([4dd4af1](https://github.com/ibissource/zaakbrug/commit/4dd4af189b7a10b9819ef16b473635434af66692))
+
+## [1.12.15](https://github.com/ibissource/zaakbrug/compare/v1.12.14...v1.12.15) (2023-06-16)
+
+
+### ✅ Tests
+
+* added aanvraag collectieve zorgverzekering zaaktype as e2e test… ([#109](https://github.com/ibissource/zaakbrug/issues/109)) ([dc9a2de](https://github.com/ibissource/zaakbrug/commit/dc9a2de293c566ec373c2d4d5fbec47d195d50d1))
+
+## [1.12.14](https://github.com/ibissource/zaakbrug/compare/v1.12.13...v1.12.14) (2023-06-16)
+
+
+### 🔁 Continuous Integration
+
+* include chart yaml in semantic release git commit ([83e2a91](https://github.com/ibissource/zaakbrug/commit/83e2a91e3d07ebfad464bc78cb28980e5979a4a3))
+
+## [1.12.13](https://github.com/ibissource/zaakbrug/compare/v1.12.12...v1.12.13) (2023-06-16)
+
+
+### 🔁 Continuous Integration
+
+* auto bump helm chart version added to semantic-release ([#118](https://github.com/ibissource/zaakbrug/issues/118)) ([03b44bc](https://github.com/ibissource/zaakbrug/commit/03b44bcf740e265259cc924ce3e460cb8f06176c))
+* helm chart plugin dependency fix during release ([#119](https://github.com/ibissource/zaakbrug/issues/119)) ([aa1ffe7](https://github.com/ibissource/zaakbrug/commit/aa1ffe77024c8ea1f084c3a9b7afb409ef4ffc86))
+
+## [1.12.12](https://github.com/ibissource/zaakbrug/compare/v1.12.11...v1.12.12) (2023-06-16)
+
+
+### 🔁 Continuous Integration
+
+* breaking release parser opts fixed to allow for major releases ([#115](https://github.com/ibissource/zaakbrug/issues/115)) ([04744eb](https://github.com/ibissource/zaakbrug/commit/04744ebbeee84bdd72fe6e8d24a7c254aa73c899))
+
 ## [1.12.11](https://github.com/ibissource/zaakbrug/compare/v1.12.10...v1.12.11) (2023-06-08)
 
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM nexus.frankframework.org/frank-framework:7.9-SNAPSHOT
+FROM docker.io/wearefrank/zaakbrug-base:5357284526
 
 # TempFix TODO: Move this to the credentialprovider.properties
 ENV credentialFactory.class=nl.nn.credentialprovider.PropertyFileCredentialFactory

charts/zaakbrug/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: openzaak
+  repository: https://maykinmedia.github.io/charts/
+  version: 1.1.0
+digest: sha256:ed482640878bdae065f96f1394e28f3266ee60dd67cc70b7bb7a2b5e0707e25b
+generated: "2023-05-26T13:51:25.779195717+02:00"

charts/zaakbrug/Chart.yaml

@@ -1,13 +1,11 @@
 apiVersion: v2
-appVersion: 1.12.11
+appVersion: 1.12.21
 description: Install ZaakBrug (zds-to-zgw) on Haven, powered by the Frank!Framework
 name: zaakbrug
 type: application
-version: 0.7.10
-
+version: 1.12.21
 home: https://github.com/ibissource/zaakbrug
-icon: "https://raw.githubusercontent.com/ibissource/zaakbrug/master/zaakbrug-icon.png"
-
+icon: https://raw.githubusercontent.com/ibissource/zaakbrug/master/zaakbrug-icon.png
 keywords:
   - zaak
   - zaaksysteem
@@ -16,3 +14,9 @@ keywords:
   - zgw
   - esb
   - frank
+dependencies:
+  - name: openzaak
+    alias: staging
+    version: 1.1.0
+    repository: https://maykinmedia.github.io/charts/
+    condition: staging.enabled

charts/zaakbrug/templates/_helpers.tpl

@@ -60,3 +60,34 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create a name for NGINX
+We truncate at 57 chars in order to provide space for the "-nginx" suffix
+*/}}
+{{- define "zaakbrug.nginxName" -}}
+{{ include "zaakbrug.name" . | trunc 57 | trimSuffix "-" }}-nginx
+{{- end }}
+
+{{/*
+Create a default fully qualified name for NGINX.
+We truncate at 57 chars in order to provide space for the "-nginx" suffix
+*/}}
+{{- define "zaakbrug.nginxFullname" -}}
+{{ include "zaakbrug.fullname" . | trunc 57 | trimSuffix "-" }}-nginx
+{{- end }}
+
+{{/*
+NGINX labels
+*/}}
+{{- define "zaakbrug.nginxLabels" -}}
+{{ include "zaakbrug.labels" . }}
+{{ include "zaakbrug.nginxSelectorLabels" . }}
+{{- end }}
+
+{{/*
+NGINX selector labels
+*/}}
+{{- define "zaakbrug.nginxSelectorLabels" -}}
+app.kubernetes.io/name: {{ include "zaakbrug.nginxName" . }}
+{{- end }}

charts/zaakbrug/templates/configmap-nginx.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.staging.enabled -}}
+{{- if not .Values.staging.apiProxy.existingConfigmap -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "zaakbrug.nginxFullname" . }}
+  labels:
+  {{- include "zaakbrug.nginxLabels" . | nindent 4 }}
+data:
+  default.conf: |-
+    server {
+      listen 8080 default_server;
+      location / {
+        proxy_pass http://{{ include "zaakbrug.fullname" . }}:{{ .Values.service.port }}/api/;
+        proxy_buffering off;
+      }
+      location /_health/ {
+        access_log off;
+        error_log /var/log/nginx/error.log error;
+        return 200 'OK';
+        }
+    }
+{{- end -}}
+{{- end -}}

charts/zaakbrug/templates/configmap.yaml

@@ -30,13 +30,13 @@ data:
   servlet.IAF-API.authenticator: AdAuthenticator
   {{- end }}
   {{- end }}
-  {{- if .Values.frank.credentials }}
+  {{- if .Values.frank.credentials.secret }}
 {{/*  credentialFactory.class: nl.nn.credentialprovider.FileSystemCredentialFactory*/}}
   credentialFactory.class: nl.nn.credentialprovider.PropertyFileCredentialFactory
   credentialFactory.map.properties: /opt/frank/secrets/{{.Values.frank.credentials.key}}
   {{- end }}
   {{- if .Values.frank.properties }}
-  {{ .Values.frank.properties | toYaml }}
+  {{ .Values.frank.properties | toYaml | nindent 2 }}
   {{- end }}
 ---
 apiVersion: v1
@@ -82,6 +82,11 @@ data:
   zaakbrug.zgw.catalogi-api.auth-alias: {{ .authAlias }}
   {{- end }}
   {{- end }}
+  {{- with .Values.staging }}
+  zaakbrug.staging.zaken-api.root-url: {{ .zakenApi.rootUrl }}
+  zaakbrug.staging.documenten-api.root-url: {{ .documentenApi.rootUrl }}
+  zaakbrug.staging.catalogi-api.root-url: {{ .catalogiApi.rootUrl }}
+  {{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap