Merge branch 'main' into gh-pages

Worth-NL · Apr 10, 2024 · 3eabf76 · 3eabf76
2 parents b839728 + a5329d1
commit 3eabf76
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -39,7 +39,20 @@ jobs:
           git config user.email "${{ github.actor }}@users.noreply.github.com"      
       - name: Install Helm ⎈
         uses: azure/setup-helm@v4
-      - name: Add dependency repos
+      - name: Prepare GPG 🔒
+        run: |
+          gpg_dir=.cr-gpg
+          mkdir "$gpg_dir"
+          keyring="$gpg_dir/secring.gpg"
+          base64 -d <<< "$GPG_KEYRING_BASE64" > "$keyring"
+          passphrase_file="$gpg_dir/passphrase"
+          echo "$GPG_PASSPHRASE" > "$passphrase_file"
+          echo "CR_PASSPHRASE_FILE=$passphrase_file" >> "$GITHUB_ENV"
+          echo "CR_KEYRING=$keyring" >> "$GITHUB_ENV"
+        env:
+          GPG_KEYRING_BASE64: "${{ secrets.GPG_KEYRING_BASE64 }}" #Referring secrets of github above
+          GPG_PASSPHRASE: "${{ secrets.GPG_PASSPHRASE }}" 
+      - name: Add dependency repos 🔗
         run: |
           helm repo add denhaag https://gemeente-denhaag.github.io/helm-charts/
           helm repo add bitnami https://charts.bitnami.com/bitnami
@@ -50,4 +63,6 @@ jobs:
           charts_dir: "./"
           skip_existing: true
         env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_KEY: "${{ secrets.CR_KEY }}"
+          CR_SIGN: true
diff --git a/notifynl-omc/Chart.yaml b/notifynl-omc/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: notifynl-omc
-version: "0.2.13-beta"
-appVersion: "1.6.5.4"
+version: "0.3.0-beta"
+appVersion: "1.6.6.1"
 kubeVersion: ">=1.26.6"
 description: "Chart to deploy the NotifyNL OMC application."
 icon: "https://avatars.githubusercontent.com/u/138866112?s=200&v=4"

diff --git a/notifynl-omc/README.md b/notifynl-omc/README.md
@@ -1,6 +1,6 @@
 # notifynl-omc
 
-![Version: 0.2.13-beta](https://img.shields.io/badge/Version-0.2.13--beta-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.5.4](https://img.shields.io/badge/AppVersion-1.6.5.4-informational?style=flat-square)
+![Version: 0.3.0-beta](https://img.shields.io/badge/Version-0.3.0--beta-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.6.1](https://img.shields.io/badge/AppVersion-1.6.6.1-informational?style=flat-square)
 
 Chart to deploy the NotifyNL OMC application.
 
@@ -51,7 +51,7 @@ Kubernetes: `>=1.26.6`
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.registry | string | `"docker.io"` |  |
 | image.repository | string | `"worthnl/notifynl-omc"` |  |
-| image.tag | string | `"1.6.5.4"` |  |
+| image.tag | string | `"1.6.6.1"` |  |
 | ingress.annotations."nginx.ingress.kubernetes.io/force-ssl-redirect" | string | `"true"` |  |
 | ingress.annotations."nginx.ingress.kubernetes.io/use-regex" | string | `"true"` |  |
 | ingress.apiVersion | string | `nil` |  |

diff --git a/notifynl-omc/values.yaml b/notifynl-omc/values.yaml
@@ -11,7 +11,7 @@
 image:
   registry: "docker.io"
   repository: "worthnl/notifynl-omc"
-  tag: "1.6.5.4"
+  tag: "1.6.6.1"
   fullImage: [] # use this from pipeline, includes registry, repo and tag
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'