Set minimum Kubernetes version to 1.23 and update tests and dependenc…

…ies (#614)
uselagoon · Oct 17, 2023 · b8612db · b8612db
1 parent d1d3aa4
commit b8612db
Show file tree

Hide file tree

Showing 28 changed files with 56 additions and 88 deletions.
diff --git 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
@@ -87,8 +87,8 @@ jobs:
       uses: helm/[email protected]
       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
@@ -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
@@ -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
@@ -12,17 +12,15 @@ maintainers:
 - name: smlx
   email: [email protected]
   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
@@ -11,7 +11,7 @@ maintainers:
 - name: shreddedbacon
   email: [email protected]
   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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@ maintainers:
 - name: shreddedbacon
   email: [email protected]
   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
@@ -9,7 +9,7 @@ maintainers:
 - name: smlx
   email: [email protected]
   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
@@ -9,7 +9,7 @@ maintainers:
 - name: smlx
   email: [email protected]
   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,12 +19,14 @@ 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
 # Valid supported kinds are added, changed, deprecated, removed, fixed and security
 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
@@ -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
@@ -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
@@ -10,7 +10,7 @@ maintainers:
 - name: smlx
   email: [email protected]
   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