From 08b1f043d6d132b677ce0756bd2ff01c5d10243e Mon Sep 17 00:00:00 2001
From: shreddedbacon <b@benjackson.email>
Date: Wed, 4 Oct 2023 11:13:52 +1100
Subject: [PATCH 1/6] chore: bump remote-controller to v0.15.1

---
 charts/lagoon-build-deploy/Chart.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/lagoon-build-deploy/Chart.yaml b/charts/lagoon-build-deploy/Chart.yaml
index 11649826..395d734b 100644
--- a/charts/lagoon-build-deploy/Chart.yaml
+++ b/charts/lagoon-build-deploy/Chart.yaml
@@ -16,11 +16,11 @@ kubeVersion: ">= 1.21.0-0"
 
 type: application
 
-version: 0.25.0
+version: 0.25.1
 
-appVersion: v0.15.0
+appVersion: v0.15.1
 
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update remote-controller appVersion to v0.15.0
+      description: update remote-controller appVersion to v0.15.1

From 8ab5e0152ed289eb3736e417c03dcf9b41baffb9 Mon Sep 17 00:00:00 2001
From: shreddedbacon <b@benjackson.email>
Date: Wed, 4 Oct 2023 15:54:05 +1100
Subject: [PATCH 2/6] chore: bump lagoon-build-deploy subchart to v0.25.1

---
 charts/lagoon-remote/Chart.lock | 6 +++---
 charts/lagoon-remote/Chart.yaml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/lagoon-remote/Chart.lock b/charts/lagoon-remote/Chart.lock
index a4dd02e0..f2117b14 100644
--- a/charts/lagoon-remote/Chart.lock
+++ b/charts/lagoon-remote/Chart.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: lagoon-build-deploy
   repository: https://uselagoon.github.io/lagoon-charts/
-  version: 0.25.0
+  version: 0.25.1
 - name: dioscuri
   repository: https://amazeeio.github.io/charts/
   version: 0.4.1
@@ -11,5 +11,5 @@ dependencies:
 - name: nats
   repository: https://nats-io.github.io/k8s/helm/charts/
   version: 0.19.17
-digest: sha256:f5484f77cfe25d079752ea3a19b1a93edb3c93e1262c4f310e149843359ff2c1
-generated: "2023-09-20T15:20:44.302630522+10:00"
+digest: sha256:15cf7820f99a3b67bc9a83db2444f54cc08669616616fb684ef39d0318f2698b
+generated: "2023-10-04T15:53:27.449884473+11:00"
diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml
index 309b8f8f..d6063977 100644
--- a/charts/lagoon-remote/Chart.yaml
+++ b/charts/lagoon-remote/Chart.yaml
@@ -19,7 +19,7 @@ type: application
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.83.0
+version: 0.83.1
 
 dependencies:
 - name: lagoon-build-deploy
@@ -45,4 +45,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update lagoon-build-deploy to v0.25.0
+      description: update lagoon-build-deploy to v0.25.1

From 419ea3f3e765bdc09045abbceae7406c481971fb Mon Sep 17 00:00:00 2001
From: shreddedbacon <b@benjackson.email>
Date: Fri, 6 Oct 2023 10:45:07 +1100
Subject: [PATCH 3/6] chore: update remote-controller to v0.15.2

---
 charts/lagoon-build-deploy/Chart.yaml                | 8 +++++---
 charts/lagoon-build-deploy/templates/deployment.yaml | 3 +++
 charts/lagoon-build-deploy/values.yaml               | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/charts/lagoon-build-deploy/Chart.yaml b/charts/lagoon-build-deploy/Chart.yaml
index 395d734b..d4262503 100644
--- a/charts/lagoon-build-deploy/Chart.yaml
+++ b/charts/lagoon-build-deploy/Chart.yaml
@@ -16,11 +16,13 @@ kubeVersion: ">= 1.21.0-0"
 
 type: application
 
-version: 0.25.1
+version: 0.25.2
 
-appVersion: v0.15.1
+appVersion: v0.15.2
 
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update remote-controller appVersion to v0.15.1
+      description: update remote-controller appVersion to v0.15.2
+    - kind: changed
+      description: added flag support for enabling k8up v2 support
diff --git a/charts/lagoon-build-deploy/templates/deployment.yaml b/charts/lagoon-build-deploy/templates/deployment.yaml
index 67cad38b..75d678e6 100644
--- a/charts/lagoon-build-deploy/templates/deployment.yaml
+++ b/charts/lagoon-build-deploy/templates/deployment.yaml
@@ -119,6 +119,9 @@ spec:
         {{- with .Values.lagoonFeatureFlagBackupWeeklyRandom }}
         - "--lagoon-feature-flag-backup-weekly-random={{ . }}"
         {{- end }}
+        {{- with .Values.lagoonFeatureFlagSupportK8upV2 }}
+        - "--lagoon-feature-flag-support-k8upv2={{ . }}"
+        {{- end }}
         {{- with .Values.lagoonBackupDefaultSchedule }}
         - "--backup-default-schedule={{ . }}"
         {{- end }}
diff --git a/charts/lagoon-build-deploy/values.yaml b/charts/lagoon-build-deploy/values.yaml
index 684974f4..ed1d2871 100644
--- a/charts/lagoon-build-deploy/values.yaml
+++ b/charts/lagoon-build-deploy/values.yaml
@@ -48,6 +48,7 @@ namespacePrefix: ""
 # lagoonFeatureFlagDefaultInsights: disabled
 # lagoonFeatureFlagForceRWX2RWO: disabled
 # lagoonFeatureFlagDefaultRWX2RWO: disabled
+# lagoonFeatureFlagSupportK8upV2: false
 
 # It is also possible to define feature flags using `extraEnvs` by defining them like so
 # this method is useful for enabling features on the fly, ones that might not have built in support

From ca4b60e649bf115464af7858b9867851260ca7ee Mon Sep 17 00:00:00 2001
From: shreddedbacon <b@benjackson.email>
Date: Fri, 6 Oct 2023 10:50:05 +1100
Subject: [PATCH 4/6] chore: update lagoon-build-deploy to v0.25.2

---
 charts/lagoon-remote/Chart.lock | 6 +++---
 charts/lagoon-remote/Chart.yaml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/lagoon-remote/Chart.lock b/charts/lagoon-remote/Chart.lock
index f2117b14..8d13133e 100644
--- a/charts/lagoon-remote/Chart.lock
+++ b/charts/lagoon-remote/Chart.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: lagoon-build-deploy
   repository: https://uselagoon.github.io/lagoon-charts/
-  version: 0.25.1
+  version: 0.25.2
 - name: dioscuri
   repository: https://amazeeio.github.io/charts/
   version: 0.4.1
@@ -11,5 +11,5 @@ dependencies:
 - name: nats
   repository: https://nats-io.github.io/k8s/helm/charts/
   version: 0.19.17
-digest: sha256:15cf7820f99a3b67bc9a83db2444f54cc08669616616fb684ef39d0318f2698b
-generated: "2023-10-04T15:53:27.449884473+11:00"
+digest: sha256:8ca3385f69f64eed0be9276ea4fb5b59e13e0caac5777e50bfae80fd6fd29cb0
+generated: "2023-10-06T10:49:35.479733592+11:00"
diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml
index d6063977..56b01e09 100644
--- a/charts/lagoon-remote/Chart.yaml
+++ b/charts/lagoon-remote/Chart.yaml
@@ -19,7 +19,7 @@ type: application
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.83.1
+version: 0.83.2
 
 dependencies:
 - name: lagoon-build-deploy
@@ -45,4 +45,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update lagoon-build-deploy to v0.25.1
+      description: update lagoon-build-deploy to v0.25.2

From d1d3aa4e2f5035b829dde023295205cfc55343af Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Tue, 17 Oct 2023 07:33:53 +1100
Subject: [PATCH 5/6] update Lagoon appVersion to v2.16.0 (#603)

---
 Makefile                                      |  2 +-
 charts/lagoon-core/Chart.yaml                 | 14 ++++----
 charts/lagoon-core/README.md                  |  2 +-
 charts/lagoon-core/ci/linter-values.yaml      | 22 ++++++++++--
 .../templates/api-redis.deployment.yaml       | 15 ++++++++
 .../lagoon-core/templates/api-redis.pvc.yaml  | 17 +++++++++
 .../lagoon-core/templates/api.deployment.yaml |  6 ++++
 .../templates/keycloak.configmap.yaml         | 24 +++++++++++++
 .../templates/keycloak.deployment.yaml        | 36 +++++++++++++++++++
 .../templates/opensearch-sync.deployment.yaml |  6 ++++
 .../templates/ssh-portal-api.deployment.yaml  |  6 ++++
 .../templates/ssh-token.deployment.yaml       |  6 ++++
 .../lagoon-core/templates/ui.deployment.yaml  | 14 ++++++--
 charts/lagoon-core/values.yaml                | 27 +++++++++++++-
 charts/lagoon-test/Chart.yaml                 |  6 ++--
 15 files changed, 186 insertions(+), 17 deletions(-)
 create mode 100644 charts/lagoon-core/templates/api-redis.pvc.yaml
 create mode 100644 charts/lagoon-core/templates/keycloak.configmap.yaml

diff --git a/Makefile b/Makefile
index ad11a559..58a6bb69 100644
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,7 @@ install-lagoon-core: install-minio
 		$$([ $(OVERRIDE_BUILD_DEPLOY_DIND_IMAGE) ] && echo '--set buildDeployImage.default.image=$(OVERRIDE_BUILD_DEPLOY_DIND_IMAGE)') \
 		$$([ $(DISABLE_CORE_HARBOR) ] && echo '--set api.additionalEnvs.DISABLE_CORE_HARBOR=$(DISABLE_CORE_HARBOR)') \
 		$$([ $(OPENSEARCH_INTEGRATION_ENABLED) ] && echo '--set api.additionalEnvs.OPENSEARCH_INTEGRATION_ENABLED=$(OPENSEARCH_INTEGRATION_ENABLED)') \
-		--set "keycloakAPIURL=http://lagoon-keycloak.$$($(KUBECTL) get nodes -o jsonpath='{.items[0].status.addresses[0].address}').nip.io:32080/auth" \
+		--set "keycloakFrontEndURL=http://lagoon-keycloak.$$($(KUBECTL) get nodes -o jsonpath='{.items[0].status.addresses[0].address}').nip.io:32080" \
 		--set "lagoonAPIURL=http://lagoon-api.$$($(KUBECTL) get nodes -o jsonpath='{.items[0].status.addresses[0].address}').nip.io:32080/graphql" \
 		--set actionsHandler.image.repository=$(IMAGE_REGISTRY)/actions-handler  \
 		--set api.image.repository=$(IMAGE_REGISTRY)/api \
diff --git a/charts/lagoon-core/Chart.yaml b/charts/lagoon-core/Chart.yaml
index 81aca95b..e78ae75f 100644
--- a/charts/lagoon-core/Chart.yaml
+++ b/charts/lagoon-core/Chart.yaml
@@ -21,13 +21,13 @@ type: application
 # time you make changes to the chart and its templates, including the app
 # version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.36.0
+version: 1.37.0
 
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.
 # Versions are not expected to follow Semantic Versioning. They should reflect
 # the version the application is using.
-appVersion: v2.15.4
+appVersion: v2.16.0
 
 dependencies:
 - name: nats
@@ -41,10 +41,12 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: add additional metrics to broker
+      description: update Lagoon appVersion to v2.16.0
     - kind: changed
-      description: update lagoon-ssh-token and lagoon-ssh-portal-api to v0.30.1
+      description: add additional keycloak configuration options
     - kind: changed
-      description: update NATS chart dependency to v0.19.17
+      description: replace keycloakAPIURL with keycloakFrontEndURL
     - kind: changed
-      description: update Lagoon appVersion to v2.15.4
+      description: added lagoonWebhookURL to UI deployment
+    - kind: added
+      description: added "persistence" option to apiRedis
diff --git a/charts/lagoon-core/README.md b/charts/lagoon-core/README.md
index eb0451b2..672eefe0 100644
--- a/charts/lagoon-core/README.md
+++ b/charts/lagoon-core/README.md
@@ -45,7 +45,7 @@ kind create cluster
 helm upgrade --install --create-namespace --namespace lagoon-core \
   --values ./charts/lagoon-core/ci/linter-values.yaml \
   --set lagoonAPIURL=http://localhost:7070/graphql \
-  --set keycloakAPIURL=http://localhost:8080/auth \
+  --set keycloakFrontEndURL=http://localhost:8080 \
   lagoon-core \
   ./charts/lagoon-core
 
diff --git a/charts/lagoon-core/ci/linter-values.yaml b/charts/lagoon-core/ci/linter-values.yaml
index 1c42e096..610c1ce0 100644
--- a/charts/lagoon-core/ci/linter-values.yaml
+++ b/charts/lagoon-core/ci/linter-values.yaml
@@ -20,8 +20,10 @@ lagoonWebhookURL: http://webhook:11213
 defaultIngressClassName: nginx
 
 # used in ui
-lagoonAPIURL: https://api.example.com/graphql
-keycloakAPIURL: https://keycloak.example.com/auth
+# lagoonAPIURL: https://api.example.com/graphql
+# keycloakFrontEndURL: https://keycloak.example.com
+
+keycloakAdminEmail: admin@example.com
 
 api:
   replicaCount: 1
@@ -53,6 +55,22 @@ actionsHandler:
     repository: uselagoon/actions-handler
 
 keycloak:
+  keycloakFrontEndURL: https://keycloak.example.com
+  realmSettings:
+    enabled: true
+    options:
+      resetPasswordAllowed: true
+      rememberMe: true
+  email:
+    enabled: true
+    settings:
+      host: mailhog
+      port: '1025'
+      fromDisplayName: Lagoon
+      from: lagoon@example.com
+      replyToDisplayName: Lagoon No-Reply
+      replyTo: lagoon@example.com
+      envelopeFrom: lagoon@example.com
   image:
     repository: uselagoon/keycloak
   resources:
diff --git a/charts/lagoon-core/templates/api-redis.deployment.yaml b/charts/lagoon-core/templates/api-redis.deployment.yaml
index 5d618590..20f7369f 100644
--- a/charts/lagoon-core/templates/api-redis.deployment.yaml
+++ b/charts/lagoon-core/templates/api-redis.deployment.yaml
@@ -36,6 +36,10 @@ spec:
             secretKeyRef:
               name: {{ include "lagoon-core.api.fullname" . }}
               key: REDIS_PASSWORD
+        {{- if .Values.apiRedis.persistence.enabled }}
+        - name: FLAVOR
+          value: persistent
+        {{- end }}
       {{- range $key, $val := .Values.apiRedis.additionalEnvs }}
         - name: {{ $key }}
           value: {{ $val | quote }}
@@ -43,6 +47,11 @@ spec:
         ports:
         - name: redis
           containerPort: 6379
+        {{- if .Values.apiRedis.persistence.enabled }}
+        volumeMounts:
+        - name: {{ include "lagoon-core.apiRedis.fullname" . }}-data
+          mountPath: /data
+        {{- end }}
         livenessProbe:
           tcpSocket:
             port: redis
@@ -51,6 +60,12 @@ spec:
             port: redis
         resources:
           {{- toYaml .Values.apiRedis.resources | nindent 10 }}
+      {{- if .Values.apiRedis.persistence.enabled }}
+      volumes:
+      - name: {{ include "lagoon-core.apiRedis.fullname" . }}-data
+        persistentVolumeClaim:
+          claimName: {{ include "lagoon-core.apiRedis.fullname" . }}-data
+      {{- end }}
       {{- with .Values.apiRedis.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/lagoon-core/templates/api-redis.pvc.yaml b/charts/lagoon-core/templates/api-redis.pvc.yaml
new file mode 100644
index 00000000..0b615321
--- /dev/null
+++ b/charts/lagoon-core/templates/api-redis.pvc.yaml
@@ -0,0 +1,17 @@
+{{- if .Values.apiRedis.persistence.enabled -}}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "lagoon-core.apiRedis.fullname" . }}-data
+  labels:
+    {{- include "lagoon-core.apiRedis.labels" . | nindent 4 }}
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ .Values.apiRedis.persistence.size | quote }}
+  {{- with .Values.apiRedis.persistence.storageClass }}
+  storageClassName: {{ . | quote }}
+  {{- end }}
+{{- end }}
diff --git a/charts/lagoon-core/templates/api.deployment.yaml b/charts/lagoon-core/templates/api.deployment.yaml
index 87bfdd46..5f469bf6 100644
--- a/charts/lagoon-core/templates/api.deployment.yaml
+++ b/charts/lagoon-core/templates/api.deployment.yaml
@@ -92,7 +92,13 @@ spec:
               name: {{ include "lagoon-core.keycloak.fullname" . }}
               key: KEYCLOAK_API_CLIENT_SECRET
         - name: KEYCLOAK_URL
+          {{- if .Values.keycloakFrontEndURL }}
+          value: {{ .Values.keycloakFrontEndURL }}
+          {{- else if .Values.keycloak.ingress.enabled }}
+          value: https://{{ index .Values.keycloak.ingress.hosts 0 "host" }}
+          {{- else }}
           value: http://{{ include "lagoon-core.keycloak.fullname" . }}:{{ .Values.keycloak.service.port }}
+          {{- end }}
         - name: KIBANA_URL
           value: {{ required "A valid .Values.kibanaURL required!" .Values.kibanaURL | quote }}
         - name: LAGOON_VERSION
diff --git a/charts/lagoon-core/templates/keycloak.configmap.yaml b/charts/lagoon-core/templates/keycloak.configmap.yaml
new file mode 100644
index 00000000..87d12c99
--- /dev/null
+++ b/charts/lagoon-core/templates/keycloak.configmap.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.keycloak.email.enabled -}}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "lagoon-core.keycloak.fullname" . }}-smtp-settings
+  labels:
+    {{- include "lagoon-core.keycloak.labels" . | nindent 4 }}
+data:
+  keycloak-smtp-settings.json: |
+    {"smtpServer":{{ .Values.keycloak.email.settings | toJson }}}
+{{ end -}}
+{{- if .Values.keycloak.realmSettings.enabled -}}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "lagoon-core.keycloak.fullname" . }}-realm-settings
+  labels:
+    {{- include "lagoon-core.keycloak.labels" . | nindent 4 }}
+data:
+  keycloak-realm-settings.json: |
+    {{ .Values.keycloak.realmSettings.options | toJson }}
+{{ end -}}
\ No newline at end of file
diff --git a/charts/lagoon-core/templates/keycloak.deployment.yaml b/charts/lagoon-core/templates/keycloak.deployment.yaml
index ab2ed50c..fc044c04 100644
--- a/charts/lagoon-core/templates/keycloak.deployment.yaml
+++ b/charts/lagoon-core/templates/keycloak.deployment.yaml
@@ -41,6 +41,18 @@ spec:
           value: {{ include "lagoon-core.keycloakDB.fullname" . }}
         - name: KEYCLOAK_ADMIN_USER
           value: {{ .Values.keycloakAdminUser | quote }}
+        - name: KEYCLOAK_FRONTEND_URL
+          {{- if .Values.keycloakFrontEndURL }}
+          value: {{ .Values.keycloakFrontEndURL }}/auth
+          {{- else if .Values.keycloak.ingress.enabled }}
+          value: https://{{ index .Values.keycloak.ingress.hosts 0 "host" }}/auth
+          {{- else }}
+          value: http://{{ include "lagoon-core.keycloak.fullname" . }}:{{ .Values.keycloak.service.port }}/auth
+          {{- end }}
+        {{- with .Values.keycloakAdminEmail }}
+        - name: KEYCLOAK_ADMIN_EMAIL
+          value: {{ . | quote }}
+        {{- end }}
       {{- range $key, $val := .Values.keycloak.additionalEnvs }}
         - name: {{ $key }}
           value: {{ $val | quote }}
@@ -67,6 +79,17 @@ spec:
             - /tmp/keycloak-config-complete
           failureThreshold: 90
           periodSeconds: 20
+        volumeMounts:
+        {{- if .Values.keycloak.email.enabled }}
+        - mountPath: /lagoon/keycloak/keycloak-smtp-settings.json
+          name: {{ include "lagoon-core.keycloak.fullname" . }}-smtp-settings
+          subPath: keycloak-smtp-settings.json
+        {{- end }}
+        {{- if .Values.keycloak.realmSettings.enabled }}
+        - mountPath: /lagoon/keycloak/keycloak-realm-settings.json
+          name: {{ include "lagoon-core.keycloak.fullname" . }}-realm-settings
+          subPath: keycloak-realm-settings.json
+        {{- end }}
         resources:
           {{- toYaml .Values.keycloak.resources | nindent 10 }}
       {{- with .Values.keycloak.nodeSelector }}
@@ -81,3 +104,16 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      volumes:
+      {{- if .Values.keycloak.email.enabled }}
+      - configMap:
+          defaultMode: 420
+          name: {{ include "lagoon-core.keycloak.fullname" . }}-smtp-settings
+        name: {{ include "lagoon-core.keycloak.fullname" . }}-smtp-settings
+      {{- end }}
+      {{- if .Values.keycloak.realmSettings.enabled }}
+      - configMap:
+          defaultMode: 420
+          name: {{ include "lagoon-core.keycloak.fullname" . }}-realm-settings
+        name: {{ include "lagoon-core.keycloak.fullname" . }}-realm-settings
+      {{- end }}
diff --git a/charts/lagoon-core/templates/opensearch-sync.deployment.yaml b/charts/lagoon-core/templates/opensearch-sync.deployment.yaml
index 6b6e7bc6..22a29d14 100644
--- a/charts/lagoon-core/templates/opensearch-sync.deployment.yaml
+++ b/charts/lagoon-core/templates/opensearch-sync.deployment.yaml
@@ -45,7 +45,13 @@ spec:
               name: {{ include "lagoon-core.apiDB.fullname" . }}
               key: API_DB_PASSWORD
         - name: KEYCLOAK_BASE_URL
+          {{- if .Values.keycloakFrontEndURL }}
+          value: {{ .Values.keycloakFrontEndURL }}/
+          {{- else if .Values.keycloak.ingress.enabled }}
+          value: https://{{ index .Values.keycloak.ingress.hosts 0 "host" }}/
+          {{- else }}
           value: http://{{ include "lagoon-core.keycloak.fullname" . }}:{{ .Values.keycloak.service.port }}/
+          {{- end }}
         - name: KEYCLOAK_CLIENT_ID
           value: lagoon-opensearch-sync
         - name: KEYCLOAK_CLIENT_SECRET
diff --git a/charts/lagoon-core/templates/ssh-portal-api.deployment.yaml b/charts/lagoon-core/templates/ssh-portal-api.deployment.yaml
index cd114421..f9bd5695 100644
--- a/charts/lagoon-core/templates/ssh-portal-api.deployment.yaml
+++ b/charts/lagoon-core/templates/ssh-portal-api.deployment.yaml
@@ -48,7 +48,13 @@ spec:
           value: "true"
         {{- end }}
         - name: KEYCLOAK_BASE_URL
+          {{- if .Values.keycloakFrontEndURL }}
+          value: {{ .Values.keycloakFrontEndURL }}/
+          {{- else if .Values.keycloak.ingress.enabled }}
+          value: https://{{ index .Values.keycloak.ingress.hosts 0 "host" }}/
+          {{- else }}
           value: http://{{ include "lagoon-core.keycloak.fullname" . }}:{{ .Values.keycloak.service.port }}/
+          {{- end }}
         - name: KEYCLOAK_SERVICE_API_CLIENT_SECRET
           valueFrom:
             secretKeyRef:
diff --git a/charts/lagoon-core/templates/ssh-token.deployment.yaml b/charts/lagoon-core/templates/ssh-token.deployment.yaml
index 5df4197d..1f2c0891 100644
--- a/charts/lagoon-core/templates/ssh-token.deployment.yaml
+++ b/charts/lagoon-core/templates/ssh-token.deployment.yaml
@@ -43,7 +43,13 @@ spec:
           value: "true"
         {{- end }}
         - name: KEYCLOAK_BASE_URL
+          {{- if .Values.keycloakFrontEndURL }}
+          value: {{ .Values.keycloakFrontEndURL }}/
+          {{- else if .Values.keycloak.ingress.enabled }}
+          value: https://{{ index .Values.keycloak.ingress.hosts 0 "host" }}/
+          {{- else }}
           value: http://{{ include "lagoon-core.keycloak.fullname" . }}:{{ .Values.keycloak.service.port }}/
+          {{- end }}
         - name: KEYCLOAK_AUTH_SERVER_CLIENT_SECRET
           valueFrom:
             secretKeyRef:
diff --git a/charts/lagoon-core/templates/ui.deployment.yaml b/charts/lagoon-core/templates/ui.deployment.yaml
index c475cb67..f3779290 100644
--- a/charts/lagoon-core/templates/ui.deployment.yaml
+++ b/charts/lagoon-core/templates/ui.deployment.yaml
@@ -45,10 +45,18 @@ spec:
           value: https://{{ index .Values.api.ingress.hosts 0 "host" }}/graphql
           {{- end }}
         - name: KEYCLOAK_API
-          {{- if .Values.keycloakAPIURL }}
-          value: {{ .Values.keycloakAPIURL | quote }}
-          {{- else }}
+          {{- if .Values.keycloakFrontEndURL }}
+          value: {{ .Values.keycloakFrontEndURL }}/auth
+          {{- else if .Values.keycloak.ingress.enabled }}
           value: https://{{ index .Values.keycloak.ingress.hosts 0 "host" }}/auth
+          {{- else }}
+          value: http://{{ include "lagoon-core.keycloak.fullname" . }}:{{ .Values.keycloak.service.port }}/auth
+          {{- end }}
+        - name: WEBHOOK_URL
+          {{- if .Values.lagoonWebhookURL }}
+          value: {{ .Values.lagoonWebhookURL | quote }}
+          {{- else }}
+          value: https://{{ index .Values.webhookHandler.ingress.hosts 0 "host" }}
           {{- end }}
         - name: LAGOON_VERSION
           value: {{ .Chart.AppVersion | replace "-" "." }}
diff --git a/charts/lagoon-core/values.yaml b/charts/lagoon-core/values.yaml
index 5850b605..6b0886e7 100644
--- a/charts/lagoon-core/values.yaml
+++ b/charts/lagoon-core/values.yaml
@@ -28,7 +28,7 @@
 # These values may be set on install, otherwise the chart tries to guess
 # sensible defaults.
 
-# keycloakAPIURL: https://keycloak.example.com/auth
+# keycloakFrontEndURL: https://keycloak.example.com
 # lagoonAPIURL: https://api.example.com/graphql
 # lagoonUIURL: https://ui.example.com
 # lagoonWebhookURL: https://webhook-handler.example.com
@@ -60,6 +60,8 @@ rabbitMQUsername: lagoon
 k8upS3Endpoint: ""
 
 keycloakAdminUser: admin
+# this is required if email sending is to be enabled in keycloak
+# keycloakAdminEmail: admin@example.com
 
 buildDeployImage:
   edge:
@@ -202,11 +204,34 @@ apiRedis:
   additionalEnvs:
   #   FOO: Bar
 
+  persistence:
+    enabled: false
+    size: 100Mi
+
   service:
     type: ClusterIP
     port: 6379
 
 keycloak:
+  # keycloak realm and email settings configuration
+  realmSettings:
+    enabled: false
+    # the full list of config settings is available TODO
+    options:
+      resetPasswordAllowed: true
+      rememberMe: true
+  email:
+    enabled: false
+    settings:
+      host: mailhog
+      port: '1025'
+      from: lagoon@example.com
+      fromDisplayName: Lagoon
+      replyTo: lagoon@example.com
+      ssl: 'false'
+      starttls: 'false'
+      auth: 'false'
+
   replicaCount: 1
   image:
     repository: uselagoon/keycloak
diff --git a/charts/lagoon-test/Chart.yaml b/charts/lagoon-test/Chart.yaml
index 076b6886..4a554260 100644
--- a/charts/lagoon-test/Chart.yaml
+++ b/charts/lagoon-test/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # time you make changes to the chart and its templates, including the app
 # version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.50.0
+version: 0.51.0
 
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.
 # Versions are not expected to follow Semantic Versioning. They should reflect
 # the version the application is using.
-appVersion: v2.15.4
+appVersion: v2.16.0
 
 # This section is used to collect a changelog for artifacthub.io
 # It should be started afresh for each release
@@ -29,4 +29,4 @@ appVersion: v2.15.4
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update Lagoon appVersion to v2.15.4
+      description: update Lagoon appVersion to v2.16.0

From b8612dbd358dff959764f83d70267669047ac633 Mon Sep 17 00:00:00 2001
From: Toby Bellwood <toby.bellwood@amazee.io>
Date: Wed, 18 Oct 2023 08:52:28 +1100
Subject: [PATCH 6/6] Set minimum Kubernetes version to 1.23 and update tests
 and dependencies (#614)

---
 .github/workflows/lint-test-matrix.yaml            |  5 ++---
 .github/workflows/lint-test.yaml                   | 10 +++++-----
 .github/workflows/test-suite.yaml                  | 14 +++++++-------
 Makefile                                           |  6 +++---
 charts/lagoon-build-deploy/Chart.yaml              |  8 +++-----
 charts/lagoon-core/Chart.yaml                      | 14 ++++----------
 charts/lagoon-core/templates/_helpers.tpl          | 11 -----------
 .../lagoon-core/templates/actions-handler.hpa.yaml |  2 +-
 charts/lagoon-core/templates/api.hpa.yaml          |  2 +-
 charts/lagoon-core/templates/auth-server.hpa.yaml  |  2 +-
 .../lagoon-core/templates/backup-handler.hpa.yaml  |  2 +-
 charts/lagoon-core/templates/broker.hpa.yaml       |  2 +-
 charts/lagoon-core/templates/drush-alias.hpa.yaml  |  2 +-
 .../templates/insights-handler.hpa.yaml            |  2 +-
 .../templates/logs2notifications.hpa.yaml          |  2 +-
 .../lagoon-core/templates/ssh-portal-api.hpa.yaml  |  2 +-
 charts/lagoon-core/templates/ssh-token.hpa.yaml    |  2 +-
 charts/lagoon-core/templates/ssh.hpa.yaml          |  2 +-
 charts/lagoon-core/templates/ui.hpa.yaml           |  2 +-
 .../lagoon-core/templates/webhook-handler.hpa.yaml |  2 +-
 .../lagoon-core/templates/webhooks2tasks.hpa.yaml  |  2 +-
 charts/lagoon-docker-host/Chart.yaml               |  6 +++---
 charts/lagoon-logging/Chart.yaml                   |  9 +++------
 charts/lagoon-logs-concentrator/Chart.yaml         |  8 +++++---
 .../templates/_helpers.tpl                         | 11 -----------
 charts/lagoon-logs-concentrator/templates/hpa.yaml |  2 +-
 charts/lagoon-remote/Chart.yaml                    |  6 +++---
 charts/lagoon-test/Chart.yaml                      |  6 +++---
 28 files changed, 56 insertions(+), 88 deletions(-)

diff --git a/.github/workflows/lint-test-matrix.yaml b/.github/workflows/lint-test-matrix.yaml
index 84d9b17e..4b30c1e2 100644
--- a/.github/workflows/lint-test-matrix.yaml
+++ b/.github/workflows/lint-test-matrix.yaml
@@ -11,12 +11,11 @@ jobs:
       fail-fast: false
       matrix:
         kindest_node_version:
-        - v1.21.14@sha256:8a4e9bb3f415d2bb81629ce33ef9c76ba514c14d707f9797a01e3216376ba093
-        - v1.22.17@sha256:f5b2e5698c6c9d6d0adc419c0deae21a425c07d81bbf3b6a6834042f25d4fba2
         - v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb
         - v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab
         - v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
-        - v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+        - v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
+        - v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
     steps:
     - name: Checkout
       uses: actions/checkout@v4
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 4721000b..adaf9e72 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -87,8 +87,8 @@ jobs:
       uses: helm/kind-action@v1.8.0
       with:
         version: v0.20.0
-        node_image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
-        kubectl_version: v1.26.6
+        node_image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+        kubectl_version: v1.27.3
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
@@ -107,9 +107,9 @@ jobs:
     - name: Install gojq
       run: |
         cd /tmp
-        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.10/gojq_v0.12.10_linux_amd64.tar.gz
-        tar -xf ./gojq_v0.12.10_linux_amd64.tar.gz
-        sudo cp /tmp/gojq_v0.12.10_linux_amd64/gojq /usr/local/bin/gojq
+        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.13/gojq_v0.12.13_linux_amd64.tar.gz
+        tar -xf ./gojq_v0.12.13_linux_amd64.tar.gz
+        sudo cp /tmp/gojq_v0.12.13_linux_amd64/gojq /usr/local/bin/gojq
 
     - name: Run artifacthub.io changelog check
       run: |
diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml
index 5e4be252..ddc97a6d 100644
--- a/.github/workflows/test-suite.yaml
+++ b/.github/workflows/test-suite.yaml
@@ -75,9 +75,9 @@ jobs:
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
       with:
         version: v0.20.0
-        node_image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
+        node_image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72
+        kubectl_version: v1.27.3
         config: test-suite.kind-config.yaml
-        kubectl_version: v1.26.6
 
     - name: Check node IP matches kind configuration
       if: |
@@ -107,15 +107,15 @@ jobs:
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
       run: |
         cd /tmp
-        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.12/gojq_v0.12.12_linux_amd64.tar.gz
-        tar -xf ./gojq_v0.12.12_linux_amd64.tar.gz
-        sudo cp /tmp/gojq_v0.12.12_linux_amd64/gojq /usr/local/bin/jq
+        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.13/gojq_v0.12.13_linux_amd64.tar.gz
+        tar -xf ./gojq_v0.12.13_linux_amd64.tar.gz
+        sudo cp /tmp/gojq_v0.12.13_linux_amd64/gojq /usr/local/bin/jq
 
     - name: Install kubens and kubectl alias
       run: |
         cd /tmp
-        curl -sSLO https://github.com/ahmetb/kubectx/releases/download/v0.9.4/kubens_v0.9.4_linux_x86_64.tar.gz
-        tar -xf ./kubens_v0.9.4_linux_x86_64.tar.gz
+        curl -sSLO https://github.com/ahmetb/kubectx/releases/download/v0.9.5/kubens_v0.9.5_linux_x86_64.tar.gz
+        tar -xf ./kubens_v0.9.5_linux_x86_64.tar.gz
         sudo cp /tmp/kubens /usr/local/bin/kubens
         sudo ln -s $(which kubectl) /usr/local/bin/kc
 
diff --git a/Makefile b/Makefile
index 58a6bb69..fa677c27 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ install-ingress:
 		--set controller.config.hsts="false" \
 		--set controller.watchIngressWithoutClass=true \
 		--set controller.ingressClassResource.default=true \
-		--version=4.6.1 \
+		--version=4.7.2 \
 		ingress-nginx \
 		ingress-nginx/ingress-nginx
 
@@ -103,7 +103,7 @@ install-registry: install-ingress
 		--set clair.enabled=false \
 		--set notary.enabled=false \
 		--set trivy.enabled=false \
-		--version=1.12.1 \
+		--version=1.13.0 \
 		registry \
 		harbor/harbor
 
@@ -159,7 +159,7 @@ install-minio: install-ingress
 		--timeout $(TIMEOUT) \
 		--set auth.rootUser=lagoonFilesAccessKey,auth.rootPassword=lagoonFilesSecretKey \
 		--set defaultBuckets=lagoon-files \
-		--version=12.6.0 \
+		--version=12.8.7 \
 		minio \
 		bitnami/minio
 
diff --git a/charts/lagoon-build-deploy/Chart.yaml b/charts/lagoon-build-deploy/Chart.yaml
index d4262503..7dbb8bc2 100644
--- a/charts/lagoon-build-deploy/Chart.yaml
+++ b/charts/lagoon-build-deploy/Chart.yaml
@@ -12,17 +12,15 @@ maintainers:
 - name: smlx
   email: scott.leggett@amazee.io
   url: https://amazee.io
-kubeVersion: ">= 1.21.0-0"
+kubeVersion: ">= 1.23.0-0"
 
 type: application
 
-version: 0.25.2
+version: 0.26.0
 
 appVersion: v0.15.2
 
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update remote-controller appVersion to v0.15.2
-    - kind: changed
-      description: added flag support for enabling k8up v2 support
+      description: require minimum Kubernetes 1.23
diff --git a/charts/lagoon-core/Chart.yaml b/charts/lagoon-core/Chart.yaml
index e78ae75f..8ed78ecd 100644
--- a/charts/lagoon-core/Chart.yaml
+++ b/charts/lagoon-core/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
 - name: shreddedbacon
   email: ben.jackson@amazee.io
   url: https://amazee.io
-kubeVersion: ">= 1.21.0-0"
+kubeVersion: ">= 1.23.0-0"
 
 # Application charts are a collection of templates that can be packaged into
 # versioned archives to be deployed.
@@ -21,7 +21,7 @@ type: application
 # time you make changes to the chart and its templates, including the app
 # version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.37.0
+version: 1.38.0
 
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.
@@ -41,12 +41,6 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update Lagoon appVersion to v2.16.0
+      description: require minimum Kubernetes 1.23
     - kind: changed
-      description: add additional keycloak configuration options
-    - kind: changed
-      description: replace keycloakAPIURL with keycloakFrontEndURL
-    - kind: changed
-      description: added lagoonWebhookURL to UI deployment
-    - kind: added
-      description: added "persistence" option to apiRedis
+      description: removed autoscaling api version helper
diff --git a/charts/lagoon-core/templates/_helpers.tpl b/charts/lagoon-core/templates/_helpers.tpl
index b385141b..d08f1362 100644
--- a/charts/lagoon-core/templates/_helpers.tpl
+++ b/charts/lagoon-core/templates/_helpers.tpl
@@ -679,14 +679,3 @@ app.kubernetes.io/name: {{ include "lagoon-core.name" . }}
 app.kubernetes.io/component: {{ include "lagoon-core.sshToken.fullname" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
-
-{{/*
-Get HorizontalPodAutoscaler API Version - can be removed once Kubernetes 1.23 is the minimum
-*/}}
-{{- define "lagoon-core.hpa.apiVersion" -}}
-  {{- if (.Capabilities.APIVersions.Has "autoscaling/v2") -}}
-    autoscaling/v2
-  {{- else -}}
-    autoscaling/v2beta2
-  {{- end -}}
-{{- end -}}
diff --git a/charts/lagoon-core/templates/actions-handler.hpa.yaml b/charts/lagoon-core/templates/actions-handler.hpa.yaml
index 0766cf98..f93afefd 100644
--- a/charts/lagoon-core/templates/actions-handler.hpa.yaml
+++ b/charts/lagoon-core/templates/actions-handler.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.actionsHandler.enabled .Values.actionsHandler.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.actionsHandler.fullname" . }}
diff --git a/charts/lagoon-core/templates/api.hpa.yaml b/charts/lagoon-core/templates/api.hpa.yaml
index 37c8c9ba..2d63eb10 100644
--- a/charts/lagoon-core/templates/api.hpa.yaml
+++ b/charts/lagoon-core/templates/api.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.api.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.api.fullname" . }}
diff --git a/charts/lagoon-core/templates/auth-server.hpa.yaml b/charts/lagoon-core/templates/auth-server.hpa.yaml
index a921136a..7d811614 100644
--- a/charts/lagoon-core/templates/auth-server.hpa.yaml
+++ b/charts/lagoon-core/templates/auth-server.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.ssh.enabled .Values.authServer.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.authServer.fullname" . }}
diff --git a/charts/lagoon-core/templates/backup-handler.hpa.yaml b/charts/lagoon-core/templates/backup-handler.hpa.yaml
index dfe335a9..ea9fb2e1 100644
--- a/charts/lagoon-core/templates/backup-handler.hpa.yaml
+++ b/charts/lagoon-core/templates/backup-handler.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.backupHandler.enabled .Values.backupHandler.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.backupHandler.fullname" . }}
diff --git a/charts/lagoon-core/templates/broker.hpa.yaml b/charts/lagoon-core/templates/broker.hpa.yaml
index 0ac81290..a93c1974 100644
--- a/charts/lagoon-core/templates/broker.hpa.yaml
+++ b/charts/lagoon-core/templates/broker.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.broker.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.broker.fullname" . }}
diff --git a/charts/lagoon-core/templates/drush-alias.hpa.yaml b/charts/lagoon-core/templates/drush-alias.hpa.yaml
index a5daaa8d..a81ecf03 100644
--- a/charts/lagoon-core/templates/drush-alias.hpa.yaml
+++ b/charts/lagoon-core/templates/drush-alias.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.drushAlias.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.drushAlias.fullname" . }}
diff --git a/charts/lagoon-core/templates/insights-handler.hpa.yaml b/charts/lagoon-core/templates/insights-handler.hpa.yaml
index e17df3ef..f08435c9 100644
--- a/charts/lagoon-core/templates/insights-handler.hpa.yaml
+++ b/charts/lagoon-core/templates/insights-handler.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.insightsHandler.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.insightsHandler.fullname" . }}
diff --git a/charts/lagoon-core/templates/logs2notifications.hpa.yaml b/charts/lagoon-core/templates/logs2notifications.hpa.yaml
index bc7521de..f225e370 100644
--- a/charts/lagoon-core/templates/logs2notifications.hpa.yaml
+++ b/charts/lagoon-core/templates/logs2notifications.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.logs2notifications.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.logs2notifications.fullname" . }}
diff --git a/charts/lagoon-core/templates/ssh-portal-api.hpa.yaml b/charts/lagoon-core/templates/ssh-portal-api.hpa.yaml
index 455900f2..849411bd 100644
--- a/charts/lagoon-core/templates/ssh-portal-api.hpa.yaml
+++ b/charts/lagoon-core/templates/ssh-portal-api.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.sshPortalAPI.enabled .Values.sshPortalAPI.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.sshPortalAPI.fullname" . }}
diff --git a/charts/lagoon-core/templates/ssh-token.hpa.yaml b/charts/lagoon-core/templates/ssh-token.hpa.yaml
index e2c19916..a025a0fb 100644
--- a/charts/lagoon-core/templates/ssh-token.hpa.yaml
+++ b/charts/lagoon-core/templates/ssh-token.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.sshToken.enabled .Values.sshToken.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.sshToken.fullname" . }}
diff --git a/charts/lagoon-core/templates/ssh.hpa.yaml b/charts/lagoon-core/templates/ssh.hpa.yaml
index fa0b2c57..555fbc6a 100644
--- a/charts/lagoon-core/templates/ssh.hpa.yaml
+++ b/charts/lagoon-core/templates/ssh.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.ssh.enabled .Values.ssh.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.ssh.fullname" . }}
diff --git a/charts/lagoon-core/templates/ui.hpa.yaml b/charts/lagoon-core/templates/ui.hpa.yaml
index 5dcba06c..b8b7e875 100644
--- a/charts/lagoon-core/templates/ui.hpa.yaml
+++ b/charts/lagoon-core/templates/ui.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.ui.enabled .Values.ui.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.ui.fullname" . }}
diff --git a/charts/lagoon-core/templates/webhook-handler.hpa.yaml b/charts/lagoon-core/templates/webhook-handler.hpa.yaml
index 1a16132f..58c428d6 100644
--- a/charts/lagoon-core/templates/webhook-handler.hpa.yaml
+++ b/charts/lagoon-core/templates/webhook-handler.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.webhookHandler.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.webhookHandler.fullname" . }}
diff --git a/charts/lagoon-core/templates/webhooks2tasks.hpa.yaml b/charts/lagoon-core/templates/webhooks2tasks.hpa.yaml
index 6e39947a..7a29522e 100644
--- a/charts/lagoon-core/templates/webhooks2tasks.hpa.yaml
+++ b/charts/lagoon-core/templates/webhooks2tasks.hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.webhooks2tasks.autoscaling.enabled -}}
-apiVersion: {{ include "lagoon-core.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-core.webhooks2tasks.fullname" . }}
diff --git a/charts/lagoon-docker-host/Chart.yaml b/charts/lagoon-docker-host/Chart.yaml
index 5310513d..3b2e4c57 100644
--- a/charts/lagoon-docker-host/Chart.yaml
+++ b/charts/lagoon-docker-host/Chart.yaml
@@ -7,7 +7,7 @@ maintainers:
 - name: shreddedbacon
   email: ben.jackson@amazee.io
   url: https://amazee.io
-kubeVersion: ">= 1.21.0-0"
+kubeVersion: ">= 1.23.0-0"
 
 # Application charts are a collection of templates that can be packaged into
 # versioned archives to be deployed.
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.1.0
+version: 0.2.0
 
 appVersion: v3.3.0
 
@@ -27,4 +27,4 @@ appVersion: v3.3.0
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update lagoon-docker-host to appversion v3.3.0
+      description: require minimum Kubernetes 1.23
diff --git a/charts/lagoon-logging/Chart.yaml b/charts/lagoon-logging/Chart.yaml
index 76cd9361..475b4c4f 100644
--- a/charts/lagoon-logging/Chart.yaml
+++ b/charts/lagoon-logging/Chart.yaml
@@ -9,7 +9,7 @@ maintainers:
 - name: smlx
   email: scott.leggett@amazee.io
   url: https://amazee.io
-kubeVersion: ">= 1.21.0-0"
+kubeVersion: ">= 1.23.0-0"
 
 # Application charts are a collection of templates that can be packaged into
 # versioned archives to be deployed.
@@ -19,7 +19,7 @@ type: application
 # time you make changes to the chart and its templates, including the app
 # version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.78.0
+version: 0.79.0
 
 dependencies:
 - name: logging-operator
@@ -33,7 +33,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: bump the logging-operator chart dependency to v4.2.3
-      links:
-        - name: Release Notes
-          url: https://github.com/uselagoon/lagoon-charts/releases/tag/lagoon-logging-0.78.0
+      description: require minimum Kubernetes 1.23
diff --git a/charts/lagoon-logs-concentrator/Chart.yaml b/charts/lagoon-logs-concentrator/Chart.yaml
index 987d3527..cc6a5f7d 100644
--- a/charts/lagoon-logs-concentrator/Chart.yaml
+++ b/charts/lagoon-logs-concentrator/Chart.yaml
@@ -9,7 +9,7 @@ maintainers:
 - name: smlx
   email: scott.leggett@amazee.io
   url: https://amazee.io
-kubeVersion: ">= 1.21.0-0"
+kubeVersion: ">= 1.23.0-0"
 
 # Application charts are a collection of templates that can be packaged into
 # versioned archives to be deployed.
@@ -19,7 +19,7 @@ type: application
 # time you make changes to the chart and its templates, including the app
 # version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.45.0
+version: 0.46.0
 
 # This section is used to collect a changelog for artifacthub.io
 # It should be started afresh for each release
@@ -27,4 +27,6 @@ version: 0.45.0
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: introduced minimum kubernetes version 1.21
+      description: require minimum Kubernetes 1.23
+    - kind: changed
+      description: removed autoscaling api version helper
diff --git a/charts/lagoon-logs-concentrator/templates/_helpers.tpl b/charts/lagoon-logs-concentrator/templates/_helpers.tpl
index 6c1edd76..e9dfc9e1 100644
--- a/charts/lagoon-logs-concentrator/templates/_helpers.tpl
+++ b/charts/lagoon-logs-concentrator/templates/_helpers.tpl
@@ -61,14 +61,3 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
-
-{{/*
-Get HorizontalPodAutoscaler API Version - can be removed once Kubernetes 1.23 is the minimum
-*/}}
-{{- define "lagoon-logs-concentrator.hpa.apiVersion" -}}
-  {{- if (.Capabilities.APIVersions.Has "autoscaling/v2") -}}
-    autoscaling/v2
-  {{- else -}}
-    autoscaling/v2beta2
-  {{- end -}}
-{{- end -}}
diff --git a/charts/lagoon-logs-concentrator/templates/hpa.yaml b/charts/lagoon-logs-concentrator/templates/hpa.yaml
index ee824389..44be3217 100644
--- a/charts/lagoon-logs-concentrator/templates/hpa.yaml
+++ b/charts/lagoon-logs-concentrator/templates/hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.autoscaling.enabled }}
-apiVersion: {{ include "lagoon-logs-concentrator.hpa.apiVersion" . }}
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "lagoon-logs-concentrator.fullname" . }}
diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml
index 56b01e09..44e8e444 100644
--- a/charts/lagoon-remote/Chart.yaml
+++ b/charts/lagoon-remote/Chart.yaml
@@ -10,7 +10,7 @@ maintainers:
 - name: smlx
   email: scott.leggett@amazee.io
   url: https://amazee.io
-kubeVersion: ">= 1.21.0-0"
+kubeVersion: ">= 1.23.0-0"
 
 # Application charts are a collection of templates that can be packaged into
 # versioned archives to be deployed.
@@ -19,7 +19,7 @@ type: application
 # This is the chart version. This version number should be incremented each
 # time you make changes to the chart and its templates, including the app
 # version.
-version: 0.83.2
+version: 0.84.0
 
 dependencies:
 - name: lagoon-build-deploy
@@ -45,4 +45,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update lagoon-build-deploy to v0.25.2
+      description: require minimum Kubernetes 1.23
diff --git a/charts/lagoon-test/Chart.yaml b/charts/lagoon-test/Chart.yaml
index 4a554260..836924df 100644
--- a/charts/lagoon-test/Chart.yaml
+++ b/charts/lagoon-test/Chart.yaml
@@ -7,7 +7,7 @@ maintainers:
 - name: smlx
   email: scott.leggett@amazee.io
   url: https://amazee.io
-kubeVersion: ">= 1.21.0-0"
+kubeVersion: ">= 1.23.0-0"
 
 type: application
 
@@ -15,7 +15,7 @@ type: application
 # time you make changes to the chart and its templates, including the app
 # version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.51.0
+version: 0.52.0
 
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.
@@ -29,4 +29,4 @@ appVersion: v2.16.0
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: update Lagoon appVersion to v2.16.0
+      description: require minimum Kubernetes 1.23