From afd5a7a478541648e538c5667f039f7f6baf72b2 Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Fri, 28 Jul 2023 09:35:28 +1000 Subject: [PATCH 01/16] chore: modify keycloak healthcheck endpoint for newer keycloak --- charts/lagoon-core/Chart.yaml | 4 ++-- charts/lagoon-core/templates/keycloak.deployment.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/lagoon-core/Chart.yaml b/charts/lagoon-core/Chart.yaml index bde851a4..339f832d 100644 --- a/charts/lagoon-core/Chart.yaml +++ b/charts/lagoon-core/Chart.yaml @@ -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.35.0 +version: 1.35.1 # 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,4 +41,4 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: update Lagoon appVersion to v2.15.3 + description: modify keycloak liveness and readiness endpoint diff --git a/charts/lagoon-core/templates/keycloak.deployment.yaml b/charts/lagoon-core/templates/keycloak.deployment.yaml index ab2ed50c..2eabf6e2 100644 --- a/charts/lagoon-core/templates/keycloak.deployment.yaml +++ b/charts/lagoon-core/templates/keycloak.deployment.yaml @@ -53,11 +53,11 @@ spec: containerPort: 8080 livenessProbe: httpGet: - path: / + path: /auth port: http-8080 readinessProbe: httpGet: - path: / + path: /auth port: http-8080 startupProbe: exec: From 30159cb2f1b85afad809da3e4520acc0605ba0fa Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Tue, 14 Nov 2023 12:53:31 +1100 Subject: [PATCH 02/16] chore: remove dioscuri subchart from lagoon-remote --- charts/lagoon-remote/Chart.lock | 7 ++----- charts/lagoon-remote/Chart.yaml | 10 +++------- charts/lagoon-remote/values.yaml | 5 ----- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/charts/lagoon-remote/Chart.lock b/charts/lagoon-remote/Chart.lock index 63327a5c..af9c068d 100644 --- a/charts/lagoon-remote/Chart.lock +++ b/charts/lagoon-remote/Chart.lock @@ -2,14 +2,11 @@ dependencies: - name: lagoon-build-deploy repository: https://uselagoon.github.io/lagoon-charts/ version: 0.26.2 -- name: dioscuri - repository: https://amazeeio.github.io/charts/ - version: 0.4.1 - name: dbaas-operator repository: https://amazeeio.github.io/charts/ version: 0.3.0 - name: nats repository: https://nats-io.github.io/k8s/helm/charts/ version: 0.19.17 -digest: sha256:98fadf31ddfe049c50ff4554a11732ec10a9cf8a41b8e0ce1c33a37af4f81de4 -generated: "2023-11-14T10:12:08.139505+11:00" +digest: sha256:6ae37f7602dc456b2b14c3ca650896f41d77a9476c1417cb4a35cb78c5ce5ee0 +generated: "2023-11-14T12:50:14.804764286+11:00" diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index 4c02e8e8..082ac49d 100644 --- a/charts/lagoon-remote/Chart.yaml +++ b/charts/lagoon-remote/Chart.yaml @@ -19,17 +19,13 @@ 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.86.1 +version: 0.87.0 dependencies: - name: lagoon-build-deploy version: ~0.26.0 repository: https://uselagoon.github.io/lagoon-charts/ condition: lagoon-build-deploy.enabled -- name: dioscuri - version: ~0.4.0 - repository: https://amazeeio.github.io/charts/ - condition: dioscuri.enabled - name: dbaas-operator version: ~0.3.0 repository: https://amazeeio.github.io/charts/ @@ -44,5 +40,5 @@ dependencies: # Valid supported kinds are added, changed, deprecated, removed, fixed and security annotations: artifacthub.io/changes: | - - kind: changed - description: update lagoon-build-deploy to v0.26.2 with updated remote-controller + - kind: removed + description: removed dioscuri subchart, activestandby is handled via a Lagoon task directly now diff --git a/charts/lagoon-remote/values.yaml b/charts/lagoon-remote/values.yaml index 7781073c..55d3720c 100644 --- a/charts/lagoon-remote/values.yaml +++ b/charts/lagoon-remote/values.yaml @@ -188,11 +188,6 @@ lagoon-build-deploy: # See the parent chart for the full range of values that can be passed here to control builds # https://github.com/uselagoon/lagoon-charts/blob/main/charts/lagoon-build-deploy/values.yaml -# dioscuri is the operator which implements Lagoon active-standby. -# This subchart is enabled by default as this is a core Lagoon feature. -dioscuri: - enabled: true - # dbaas-operator provisions database-as-a-service accounts for projects. # Example provider configuration can be found in the dbaas-operator values.yaml # https://github.com/amazeeio/charts/blob/main/charts/dbaas-operator/values.yaml From bf52e937293a9285e8bb4d2a0824864d779f8f32 Mon Sep 17 00:00:00 2001 From: rashed-k Date: Tue, 28 Nov 2023 09:35:08 +1100 Subject: [PATCH 03/16] fixed insightsRemote service bug --- charts/lagoon-remote/templates/insights-remote.service.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/lagoon-remote/templates/insights-remote.service.yaml b/charts/lagoon-remote/templates/insights-remote.service.yaml index 01f105dd..dac317ae 100644 --- a/charts/lagoon-remote/templates/insights-remote.service.yaml +++ b/charts/lagoon-remote/templates/insights-remote.service.yaml @@ -1,3 +1,4 @@ +{{- if .Values.insightsRemote.enabled -}} apiVersion: v1 kind: Service metadata: @@ -13,3 +14,4 @@ spec: name: insights-ws selector: {{- include "lagoon-remote.insightsRemote.selectorLabels" . | nindent 4 }} +{{- end }} \ No newline at end of file From 258225b67a320d3b32937b8598588eda2c886b21 Mon Sep 17 00:00:00 2001 From: Scott Leggett Date: Thu, 14 Dec 2023 13:54:39 +0800 Subject: [PATCH 04/16] fix: avoid installing the registry multiple times While the fill-test-ci-values target's dependency on install-registry was correctly manipulated by the SKIP_INSTALL_REGISTRY variable, the install-lagoon-build-deploy target had a hard-coded dependency on install-registry. The result was that the registry would get installed multiple times anyway via the fill-test-ci-values target via an indirect dependency. Fix that by removing the dependency that install-lagoon-build-deploy has on install-registry when SKIP_INSTALL_REGISTRY=true. --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 64088fcf..16c8ea97 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,7 @@ install-lagoon-remote: install-lagoon-build-deploy install-lagoon-core install-m # Do not install without lagoon-core # .PHONY: install-lagoon-build-deploy -install-lagoon-build-deploy: install-lagoon-core install-registry +install-lagoon-build-deploy: install-lagoon-core $(HELM) dependency build ./charts/lagoon-build-deploy/ $(HELM) upgrade \ --install \ @@ -288,6 +288,11 @@ install-lagoon-build-deploy: install-lagoon-core install-registry lagoon-build-deploy \ ./charts/lagoon-build-deploy +# allow skipping registry install for install-lagoon-remote target +ifneq ($(SKIP_INSTALL_REGISTRY),true) +install-lagoon-build-deploy: install-registry +endif + # # The following targets facilitate local development only and aren't used in CI. # From dd6c1dad40007c067c7ff1288112e7aff0f868a0 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 15 Dec 2023 14:34:49 +1100 Subject: [PATCH 05/16] chore: use 1.28 as default k8s --- .github/workflows/lint-test-matrix.yaml | 1 + .github/workflows/lint-test.yaml | 4 ++-- .github/workflows/test-suite.yaml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint-test-matrix.yaml b/.github/workflows/lint-test-matrix.yaml index e5ed6588..2171946f 100644 --- a/.github/workflows/lint-test-matrix.yaml +++ b/.github/workflows/lint-test-matrix.yaml @@ -15,6 +15,7 @@ jobs: - v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab - v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8 - v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb + - v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 steps: - name: Checkout diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index a16a362c..7a344d96 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.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - kubectl_version: v1.27.3 + node_image: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 + kubectl_version: v1.28.0 if: | (steps.list-changed.outputs.changed == 'true') || (contains(github.event.pull_request.labels.*.name, 'needs-testing')) diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index b2039684..881bcc1c 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -75,8 +75,8 @@ jobs: (contains(github.event.pull_request.labels.*.name, 'needs-testing')) with: version: v0.20.0 - node_image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - kubectl_version: v1.27.3 + node_image: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 + kubectl_version: v1.28.0 config: test-suite.kind-config.yaml - name: Check node IP matches kind configuration From 744a18ac4f568dea58a547d5a95dd769e8d70695 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 15 Dec 2023 14:35:17 +1100 Subject: [PATCH 06/16] chore: add 1.29 to test-matrix --- .github/workflows/lint-test-matrix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test-matrix.yaml b/.github/workflows/lint-test-matrix.yaml index 2171946f..aeeb2081 100644 --- a/.github/workflows/lint-test-matrix.yaml +++ b/.github/workflows/lint-test-matrix.yaml @@ -16,7 +16,7 @@ jobs: - v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8 - v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb - v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - - v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 + - v1.29.0@sha256:eaa1450915475849a73a9227b8f201df25e55e268e5d619312131292e324d570 steps: - name: Checkout uses: actions/checkout@v4 From 195669ccc5780e52fb21926d35728a4ae0c9f822 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 15 Dec 2023 15:20:06 +1100 Subject: [PATCH 07/16] force action run From 93efcafb10253d1464890d56ac36022bc4d78e46 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 15 Dec 2023 18:48:02 +1100 Subject: [PATCH 08/16] ensure chart-testing runs on needs-testing --- .github/workflows/lint-test.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 7a344d96..4b09a8e4 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -96,6 +96,11 @@ jobs: - name: Run chart-testing (install) run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m" + - name: Run chart-testing (needs-testing) + run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m" --all + if: | + (contains(github.event.pull_request.labels.*.name, 'needs-testing')) + artifacthub-changelog: runs-on: ubuntu-latest steps: From 479de771d54a4e0062ef740d015594c28dd88a16 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 7 Feb 2024 16:50:07 +1100 Subject: [PATCH 09/16] use main branch images to test --- .github/workflows/test-suite.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index b2039684..b91e17b4 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -123,8 +123,8 @@ jobs: if: | (steps.list-changed.outputs.changed == 'true') || (contains(github.event.pull_request.labels.*.name, 'needs-testing')) - # run: make -j8 -O fill-test-ci-values TESTS=[${{ matrix.test }}] IMAGE_REGISTRY=testlagoon IMAGE_TAG=main OVERRIDE_BUILD_DEPLOY_DIND_IMAGE=uselagoon/build-deploy-image:main OVERRIDE_ACTIVE_STANDBY_TASK_IMAGE=testlagoon/task-activestandby:main - run: make -j8 -O fill-test-ci-values TESTS=[${{ matrix.test }}] + run: make -j8 -O fill-test-ci-values TESTS=[${{ matrix.test }}] IMAGE_REGISTRY=testlagoon IMAGE_TAG=main OVERRIDE_BUILD_DEPLOY_DIND_IMAGE=uselagoon/build-deploy-image:main OVERRIDE_ACTIVE_STANDBY_TASK_IMAGE=testlagoon/task-activestandby:main + # run: make -j8 -O fill-test-ci-values TESTS=[${{ matrix.test }}] - name: Free up some disk space if: | From 261eac63f192e39c4373db5d3cd522d636f40833 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 7 Feb 2024 17:55:15 +1100 Subject: [PATCH 10/16] force actions run From 5ce0953c2394dc4aa8b8f12a839cc1f9671eb5fc Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Thu, 15 Feb 2024 10:06:42 +1100 Subject: [PATCH 11/16] chore: bump chart version --- charts/lagoon-remote/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index 082ac49d..7cdf7d67 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.87.0 +version: 0.88.0 dependencies: - name: lagoon-build-deploy From 4f2f2a31fbf679a3118f533078e8bafe0eaabff5 Mon Sep 17 00:00:00 2001 From: shreddedbacon Date: Thu, 15 Feb 2024 12:40:39 +1100 Subject: [PATCH 12/16] chore: update storage-calcluator and add metrics monitor --- charts/lagoon-remote/Chart.yaml | 10 +++------- charts/lagoon-remote/ci/linter-values.yaml | 2 ++ .../storage-calculator.deployment.yaml | 6 +++++- .../templates/storage-calculator.service.yaml | 17 +++++++++++++++++ .../storage-calculator.servicemonitor.yaml | 18 ++++++++++++++++++ charts/lagoon-remote/values.yaml | 10 +++++++++- 6 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 charts/lagoon-remote/templates/storage-calculator.service.yaml create mode 100644 charts/lagoon-remote/templates/storage-calculator.servicemonitor.yaml diff --git a/charts/lagoon-remote/Chart.yaml b/charts/lagoon-remote/Chart.yaml index 26141057..e69c70bb 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.87.0 +version: 0.88.0 dependencies: - name: lagoon-build-deploy @@ -45,10 +45,6 @@ dependencies: annotations: artifacthub.io/changes: | - kind: changed - description: remove insights-remote service if not enabled - - kind: removed - description: removed old kubernetes build deploy references + description: update storage-calculator to v0.5.1 - kind: changed - description: updated to insights-remote:v0.0.8 - - kind: changed - description: updated lagoon-build-deploy chart to v0.26.3 + description: added metrics to storage-calculator diff --git a/charts/lagoon-remote/ci/linter-values.yaml b/charts/lagoon-remote/ci/linter-values.yaml index 9c7e7d9d..fcb91171 100644 --- a/charts/lagoon-remote/ci/linter-values.yaml +++ b/charts/lagoon-remote/ci/linter-values.yaml @@ -98,3 +98,5 @@ sshPortal: storageCalculator: enabled: true + serviceMonitor: + enabled: false diff --git a/charts/lagoon-remote/templates/storage-calculator.deployment.yaml b/charts/lagoon-remote/templates/storage-calculator.deployment.yaml index f4cc3ecf..49dcd6df 100644 --- a/charts/lagoon-remote/templates/storage-calculator.deployment.yaml +++ b/charts/lagoon-remote/templates/storage-calculator.deployment.yaml @@ -35,10 +35,14 @@ spec: command: - /manager args: - - "--metrics-bind-address=127.0.0.1:8080" + - "--metrics-bind-address=0.0.0.0:8080" + - "--prometheus-metrics=true" {{- with .Values.storageCalculator.extraArgs }} {{- toYaml . | nindent 8 }} {{- end }} + ports: + - name: metrics + containerPort: 8080 env: {{- range $name, $value := .Values.storageCalculator.extraEnvs }} - name: {{ .name }} diff --git a/charts/lagoon-remote/templates/storage-calculator.service.yaml b/charts/lagoon-remote/templates/storage-calculator.service.yaml new file mode 100644 index 00000000..8a73bfdf --- /dev/null +++ b/charts/lagoon-remote/templates/storage-calculator.service.yaml @@ -0,0 +1,17 @@ +{{- if .Values.storageCalculator.enabled -}} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "lagoon-remote.storageCalculator.fullname" . }}-metrics + labels: + metrics-only: "true" + {{- include "lagoon-remote.storageCalculator.labels" . | nindent 4 }} +spec: + type: {{ .Values.storageCalculator.metricsService.type }} + ports: + - port: {{ .Values.storageCalculator.metricsService.ports.metrics }} + targetPort: metrics + name: metrics + selector: + {{- include "lagoon-remote.storageCalculator.selectorLabels" . | nindent 4 }} +{{- end }} diff --git a/charts/lagoon-remote/templates/storage-calculator.servicemonitor.yaml b/charts/lagoon-remote/templates/storage-calculator.servicemonitor.yaml new file mode 100644 index 00000000..fc339b51 --- /dev/null +++ b/charts/lagoon-remote/templates/storage-calculator.servicemonitor.yaml @@ -0,0 +1,18 @@ +{{- if and .Values.storageCalculator.enabled .Values.storageCalculator.serviceMonitor.enabled -}} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ include "lagoon-remote.storageCalculator.fullname" . }} + labels: + {{- include "lagoon-remote.storageCalculator.labels" . | nindent 4 }} +spec: + endpoints: + - port: metrics + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + selector: + matchLabels: + metrics-only: "true" + {{- include "lagoon-remote.storageCalculator.selectorLabels" . | nindent 6 }} +{{- end }} diff --git a/charts/lagoon-remote/values.yaml b/charts/lagoon-remote/values.yaml index 866f1871..e301cb5e 100644 --- a/charts/lagoon-remote/values.yaml +++ b/charts/lagoon-remote/values.yaml @@ -362,8 +362,16 @@ storageCalculator: # template name: + metricsService: + type: ClusterIP + ports: + metrics: 9912 + + serviceMonitor: + enabled: true + image: repository: uselagoon/remote-calculator pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: v0.2.3 + tag: v0.5.1 From 6a972118742bef11294be743ad0762445fb06353 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 23 Feb 2024 16:53:51 +1100 Subject: [PATCH 13/16] update actions and build dependencies --- .github/workflows/lint-test-matrix.yaml | 18 +++++++++--------- .github/workflows/lint-test.yaml | 10 +++++----- .github/workflows/release.yaml | 9 +-------- .github/workflows/test-suite.yaml | 12 ++++++------ Makefile | 6 +++--- 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/.github/workflows/lint-test-matrix.yaml b/.github/workflows/lint-test-matrix.yaml index aeeb2081..7e63c08a 100644 --- a/.github/workflows/lint-test-matrix.yaml +++ b/.github/workflows/lint-test-matrix.yaml @@ -11,12 +11,12 @@ jobs: fail-fast: false matrix: kindest_node_version: - - v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb - - v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab - - v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8 - - v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb - - v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 - - v1.29.0@sha256:eaa1450915475849a73a9227b8f201df25e55e268e5d619312131292e324d570 + - v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3 + - v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51 + - v1.25.16@sha256:e8b50f8e06b44bb65a93678a65a26248fae585b3d3c2a669e5ca6c90c69dc519 + - v1.26.14@sha256:5d548739ddef37b9318c70cb977f57bf3e5015e4552be4e27e57280a8cbb8e4f + - v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843 + - v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 steps: - name: Checkout uses: actions/checkout@v4 @@ -27,7 +27,7 @@ jobs: run: sudo apt-get -y install python3-wheel - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (list-changed) id: list-changed @@ -42,9 +42,9 @@ jobs: run: ct lint --config ./default.ct.yaml - name: Create kind cluster - uses: helm/kind-action@v1.8.0 + uses: helm/kind-action@v1.9.0 with: - version: v0.20.0 + version: v0.22.0 node_image: kindest/node:${{ matrix.kindest_node_version }} if: | (steps.list-changed.outputs.changed == 'true') || diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 4b09a8e4..76d6e383 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -69,7 +69,7 @@ jobs: run: sudo apt-get -y install python3-wheel - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (list-changed) id: list-changed @@ -84,11 +84,11 @@ jobs: run: ct lint --config ./default.ct.yaml - name: Create kind cluster - uses: helm/kind-action@v1.8.0 + uses: helm/kind-action@v1.9.0 with: - version: v0.20.0 - node_image: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 - kubectl_version: v1.28.0 + version: v0.22.0 + node_image: kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58 + kubectl_version: v1.28.7 if: | (steps.list-changed.outputs.changed == 'true') || (contains(github.event.pull_request.labels.*.name, 'needs-testing')) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 522bb8ac..b03949dc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -19,13 +19,6 @@ jobs: git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - # See https://github.com/helm/chart-releaser-action/issues/6 - - name: Install Helm - run: | - curl -fsSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 - chmod 700 get_helm.sh - ./get_helm.sh - - name: Add dependency chart repos run: | helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com @@ -35,6 +28,6 @@ jobs: helm repo add kube-logging https://kube-logging.github.io/helm-charts - name: Run chart-releaser - uses: helm/chart-releaser-action@v1.5.0 + uses: helm/chart-releaser-action@v1.6.0 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml index a500058b..69cbea3c 100644 --- a/.github/workflows/test-suite.yaml +++ b/.github/workflows/test-suite.yaml @@ -5,7 +5,7 @@ on: pull_request jobs: # runs for lagoon-core, lagoon-remote, lagoon-test test-suite: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -48,7 +48,7 @@ jobs: run: sudo apt-get -y install python3-wheel - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (list-changed) id: list-changed @@ -69,14 +69,14 @@ jobs: envsubst < test-suite.kind-config.yaml.tpl > test-suite.kind-config.yaml - name: Create kind cluster - uses: helm/kind-action@v1.8.0 + uses: helm/kind-action@v1.9.0 if: | (steps.list-changed.outputs.changed == 'true') || (contains(github.event.pull_request.labels.*.name, 'needs-testing')) with: - version: v0.20.0 - node_image: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 - kubectl_version: v1.28.0 + version: v0.22.0 + node_image: kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58 + kubectl_version: v1.28.7 config: test-suite.kind-config.yaml - name: Check node IP matches kind configuration diff --git a/Makefile b/Makefile index 16c8ea97..8cb1713e 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ install-ingress: --set controller.config.hsts="false" \ --set controller.watchIngressWithoutClass=true \ --set controller.ingressClassResource.default=true \ - --version=4.7.2 \ + --version=4.9.1 \ ingress-nginx \ ingress-nginx/ingress-nginx @@ -106,7 +106,7 @@ install-registry: install-ingress --set clair.enabled=false \ --set notary.enabled=false \ --set trivy.enabled=false \ - --version=1.13.0 \ + --version=1.14.0 \ registry \ harbor/harbor @@ -162,7 +162,7 @@ install-minio: install-ingress --timeout $(TIMEOUT) \ --set auth.rootUser=lagoonFilesAccessKey,auth.rootPassword=lagoonFilesSecretKey \ --set defaultBuckets='lagoon-files\,restores' \ - --version=12.8.7 \ + --version=13.6.2 \ minio \ bitnami/minio From b1a008c762d6cea9ba2fa698ab0c41f1c3ac2e0f Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 23 Feb 2024 17:40:13 +1100 Subject: [PATCH 14/16] use ingress-nginx 4.7.5 to allow server-snippets --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8cb1713e..79278339 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,7 @@ endif .PHONY: install-ingress install-ingress: + # Using 4.7.x because server snippets https://github.com/kubernetes/ingress-nginx/issues/10543 $(HELM) upgrade \ --install \ --create-namespace \ @@ -86,7 +87,7 @@ install-ingress: --set controller.config.hsts="false" \ --set controller.watchIngressWithoutClass=true \ --set controller.ingressClassResource.default=true \ - --version=4.9.1 \ + --version=4.7.5 \ ingress-nginx \ ingress-nginx/ingress-nginx From a8ea19e301cb83ec0726a3ab6143ccdabb5474c4 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 26 Feb 2024 16:16:45 +1100 Subject: [PATCH 15/16] chore: upgrade ingress-nginx and allowSnippetAnnotations --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 79278339..45f64657 100644 --- a/Makefile +++ b/Makefile @@ -73,13 +73,13 @@ endif .PHONY: install-ingress install-ingress: - # Using 4.7.x because server snippets https://github.com/kubernetes/ingress-nginx/issues/10543 $(HELM) upgrade \ --install \ --create-namespace \ --namespace ingress-nginx \ --wait \ --timeout $(TIMEOUT) \ + --set controller.allowSnippetAnnotations=true \ --set controller.service.type=NodePort \ --set controller.service.nodePorts.http=32080 \ --set controller.service.nodePorts.https=32443 \ @@ -87,7 +87,7 @@ install-ingress: --set controller.config.hsts="false" \ --set controller.watchIngressWithoutClass=true \ --set controller.ingressClassResource.default=true \ - --version=4.7.5 \ + --version=4.9.1 \ ingress-nginx \ ingress-nginx/ingress-nginx From 3120b26b57d35cb0e1ab9a39e42ce6963347caff Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 28 Feb 2024 10:43:04 +1100 Subject: [PATCH 16/16] chore: update storage-calculator to v0.5.2 --- charts/lagoon-remote/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/lagoon-remote/values.yaml b/charts/lagoon-remote/values.yaml index 0c039946..cd747e32 100644 --- a/charts/lagoon-remote/values.yaml +++ b/charts/lagoon-remote/values.yaml @@ -369,4 +369,4 @@ storageCalculator: repository: uselagoon/remote-calculator pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: v0.5.1 + tag: v0.5.2