chore: Update to app version 2.9.6 (#50)

* chore: Update to app version 2.9.6

* fix: Fix PDB compat for K8s versions >=1.21

* fix: Use keycloak image via quay.io

* chore: Wait until keycloak deployment completes

.github/manifest.yaml

@@ -2214,7 +2214,7 @@ spec:
     spec:
       containers:
         - name: keycloak
-          image: jboss/keycloak:16.1.1
+          image: quay.io/keycloak/keycloak:16.1.1
           env:
             - name: KEYCLOAK_USER
               value: admin

.github/workflows/lint-and-test.yml

@@ -50,6 +50,7 @@ jobs:
         run: |
           kubectl config use-context kind-chart-testing
           kubectl apply -f .github/manifest.yaml
+          kubectl rollout status deployment/keycloak --timeout=600s
 
       - name: Run chart-testing (install)
         run: ct install --config .github/ct.yaml

charts/gatekeeper/Chart.yaml

@@ -24,5 +24,5 @@ sources:
 maintainers:
   - name: gogatekeeper
     url: https://gogatekeeper.github.io/
-version: 0.1.46
-appVersion: "2.9.4"
+version: 0.1.47
+appVersion: "2.9.6"

charts/gatekeeper/templates/_helpers.tpl

@@ -74,6 +74,17 @@ Return the appropriate apiVersion for ingress
 {{- end -}}
 {{- end -}}
 
+{{/*
+Return the appropriate apiVersion for PodDisruptionBudget
+*/}}
+{{- define "gatekeeper.pdb.apiVersion" -}}
+{{- if semverCompare "<1.21-0" (include "gatekeeper.kubeVersion" $) -}}
+{{- print "policy/v1beta1" -}}
+{{- else -}}
+{{- print "policy/v1" -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Return the target Kubernetes version
 */}}

charts/gatekeeper/templates/pdb.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.pdb.create }}
-apiVersion: policy/v1beta1
+apiVersion: {{ include "gatekeeper.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "gatekeeper.fullname" . }}