Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set minimum Kubernetes version to 1.23 and update tests and dependencies #614

Merged
merged 6 commits into from
Oct 17, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
req k8s 1.23
  • Loading branch information
tobybellwood committed Sep 22, 2023
commit 96852c6856c7b6bb2e6118f5d1a7876c9d8e3fb6
5 changes: 2 additions & 3 deletions .github/workflows/lint-test-matrix.yaml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
@@ -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: |
14 changes: 7 additions & 7 deletions .github/workflows/test-suite.yaml
Original file line number Diff line number Diff line change
@@ -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

6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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

6 changes: 3 additions & 3 deletions charts/lagoon-build-deploy/Chart.yaml
Original file line number Diff line number Diff line change
@@ -12,15 +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.0
version: 0.26.0

appVersion: v0.15.0

annotations:
artifacthub.io/changes: |
- kind: changed
description: update remote-controller appVersion to v0.15.0
description: require minimum Kubernetes 1.23
6 changes: 3 additions & 3 deletions charts/lagoon-docker-host/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 3 additions & 6 deletions charts/lagoon-logging/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions charts/lagoon-remote/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.0
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.0
description: require minimum Kubernetes 1.23
6 changes: 3 additions & 3 deletions charts/lagoon-test/Chart.yaml
Original file line number Diff line number Diff line change
@@ -7,15 +7,15 @@ maintainers:
- name: smlx
email: [email protected]
url: https://amazee.io
kubeVersion: ">= 1.21.0-0"
kubeVersion: ">= 1.23.0-0"

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.
# 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.
@@ -29,4 +29,4 @@ appVersion: v2.15.4
annotations:
artifacthub.io/changes: |
- kind: changed
description: update Lagoon appVersion to v2.15.4
description: require minimum Kubernetes 1.23