Lagoon v2.20.0 release, Kubernetes 1.25 minimum (#669)

uselagoon · Jul 23, 2024 · 48b7c5d · 48b7c5d
1 parent c52604f
commit 48b7c5d
Show file tree

Hide file tree

Showing 24 changed files with 497 additions and 186 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.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
+        - v1.25.16@sha256:5da57dfc290ac3599e775e63b8b6c49c0c85d3fec771cd7d55b45fae14b38d3b
+        - v1.26.15@sha256:84333e26cae1d70361bb7339efb568df1871419f2019c80f9a12b7e2d485fe19
+        - v1.27.13@sha256:17439fa5b32290e3ead39ead1250dca1d822d94a10d26f1981756cd51b24b9d8
+        - v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0
+        - v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -44,16 +43,23 @@ jobs:
     - name: Create kind cluster
       uses: helm/kind-action@v1.10.0
       with:
-        version: v0.22.0
+        version: v0.23.0
         node_image: kindest/node:${{ matrix.kindest_node_version }}
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
 
-    - name: Run chart-testing (install)
-      run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m"
+    - name: Run chart-testing (install changed only)
+      run: |
+        ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m"
+      if: ${{ !contains(github.event.pull_request.labels.*.name, 'next-release') && !contains(github.event.pull_request.labels.*.name, 'needs-testing') }}
+
+    - name: Run chart-testing (install changed next-release only)
+      run: |
+        yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' ./charts/lagoon-core/ci/linter-values.yaml ./charts/lagoon-core/ci/testlagoon-main-override.yaml
+        ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m"
+      if: ${{ contains(github.event.pull_request.labels.*.name, 'next-release') }}
 
-    - name: Run chart-testing (needs-testing)
+    - name: Run chart-testing (install all charts when required)
       run: ct install --config ./default.ct.yaml  --helm-extra-args "--timeout 30m" --all
-      if: |
-        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
+      if: ${{ contains(github.event.pull_request.labels.*.name, 'next-release') || contains(github.event.pull_request.labels.*.name, 'needs-testing') }}
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -8,12 +8,6 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Install Helm
-      run: |
-        cd /tmp
-        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
@@ -41,8 +35,6 @@ jobs:
         # workaround until nats templates are fixed
         rm -rf /tmp/charts/lagoon-remote/lagoon-remote/charts/nats
         rm -rf /tmp/charts/lagoon-core/lagoon-core/charts/nats
-    - name: Install YAMLlint
-      run: sudo apt-get -y install yamllint
     - name: Lint the templates
       run: |
         set -euo pipefail
@@ -86,20 +78,27 @@ jobs:
     - name: Create kind cluster
       uses: helm/kind-action@v1.10.0
       with:
-        version: v0.22.0
-        node_image: kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58
-        kubectl_version: v1.28.7
+        version: v0.23.0
+        node_image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
+        kubectl_version: v1.30.0
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
         (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
 
-    - name: Run chart-testing (install)
-      run: ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m"
+    - name: Run chart-testing (install changed only)
+      run: |
+        ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m"
+      if: ${{ !contains(github.event.pull_request.labels.*.name, 'next-release') && !contains(github.event.pull_request.labels.*.name, 'needs-testing') }}
 
-    - name: Run chart-testing (needs-testing)
+    - name: Run chart-testing (install changed next-release only)
+      run: |
+        yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' ./charts/lagoon-core/ci/linter-values.yaml ./charts/lagoon-core/ci/testlagoon-main-override.yaml
+        ct install --config ./default.ct.yaml --helm-extra-args "--timeout 30m"
+      if: ${{ contains(github.event.pull_request.labels.*.name, 'next-release') }}
+
+    - name: Run chart-testing (install all charts when required)
       run: ct install --config ./default.ct.yaml  --helm-extra-args "--timeout 30m" --all
-      if: |
-        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
+      if: ${{ contains(github.event.pull_request.labels.*.name, 'next-release') || contains(github.event.pull_request.labels.*.name, 'needs-testing') }}
 
   artifacthub-changelog:
     runs-on: ubuntu-latest
@@ -112,9 +111,9 @@ jobs:
     - name: Install gojq
       run: |
         cd /tmp
-        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
+        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.16/gojq_v0.12.16_linux_amd64.tar.gz
+        tar -xf ./gojq_v0.12.16_linux_amd64.tar.gz
+        sudo cp /tmp/gojq_v0.12.16_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
@@ -62,36 +62,42 @@ jobs:
     - name: Configure node IP in kind-config.yaml
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
-        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
+        (contains(github.event.pull_request.labels.*.name, 'needs-testing')) ||
+        (contains(github.event.pull_request.labels.*.name, 'next-release'))
       run: |
         docker network create kind
-        export KIND_NODE_IP=$(docker run --network kind --rm alpine ip -o addr show eth0 | sed -nE 's/.* ([0-9.]{7,})\/.*/\1/p')
+        LAGOON_KIND_CIDR_BLOCK=$(docker network inspect kind | jq '. [0].IPAM.Config[0].Subnet' | tr -d '"') 
+        export KIND_NODE_IP=$(echo ${LAGOON_KIND_CIDR_BLOCK%???} | awk -F'.' '{print $1,$2,$3,240}' OFS='.')
         envsubst < test-suite.kind-config.yaml.tpl > test-suite.kind-config.yaml
 
     - name: Create kind cluster
       uses: helm/kind-action@v1.10.0
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
-        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
+        (contains(github.event.pull_request.labels.*.name, 'needs-testing')) ||
+        (contains(github.event.pull_request.labels.*.name, 'next-release'))
       with:
-        version: v0.22.0
-        node_image: kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58
-        kubectl_version: v1.28.7
+        version: v0.23.0
+        node_image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
+        kubectl_version: v1.30.0
         config: test-suite.kind-config.yaml
 
     - name: Check node IP matches kind configuration
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
-        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
+        (contains(github.event.pull_request.labels.*.name, 'needs-testing')) ||
+        (contains(github.event.pull_request.labels.*.name, 'next-release'))
       run: |
-        NODE_IP="$(kubectl get nodes -o jsonpath='{.items[0].status.addresses[0].address}')"
+        LAGOON_KIND_CIDR_BLOCK=$(docker network inspect kind | jq '. [0].IPAM.Config[0].Subnet' | tr -d '"')
+        NODE_IP=$(echo ${LAGOON_KIND_CIDR_BLOCK%???} | awk -F'.' '{print $1,$2,$3,240}' OFS='.')
         echo Checking for NODE_IP "$NODE_IP"
         grep $NODE_IP test-suite.kind-config.yaml
 
     - name: Add dependency chart repos
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
-        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
+        (contains(github.event.pull_request.labels.*.name, 'needs-testing')) ||
+        (contains(github.event.pull_request.labels.*.name, 'next-release'))
       run: |
         helm repo add harbor https://helm.goharbor.io
         helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
@@ -100,16 +106,20 @@ jobs:
         helm repo add amazeeio https://amazeeio.github.io/charts/
         helm repo add lagoon https://uselagoon.github.io/lagoon-charts/
         helm repo add nats https://nats-io.github.io/k8s/helm/charts/
+        helm repo add metallb https://metallb.github.io/metallb
+        helm repo add jetstack https://charts.jetstack.io
+        helm repo add jouve https://jouve.github.io/charts/
 
     - name: Install gojq
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
-        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
+        (contains(github.event.pull_request.labels.*.name, 'needs-testing')) ||
+        (contains(github.event.pull_request.labels.*.name, 'next-release'))
       run: |
         cd /tmp
-        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
+        curl -sSLO https://github.com/itchyny/gojq/releases/download/v0.12.16/gojq_v0.12.16_linux_amd64.tar.gz
+        tar -xf ./gojq_v0.12.16_linux_amd64.tar.gz
+        sudo cp /tmp/gojq_v0.12.16_linux_amd64/gojq /usr/local/bin/jq
 
     - name: Install kubens and kubectl alias
       run: |
@@ -119,23 +129,32 @@ jobs:
         sudo cp /tmp/kubens /usr/local/bin/kubens
         sudo ln -s $(which kubectl) /usr/local/bin/kc
 
-    - name: Helm-install the test fixtures and fill lagoon-test/ci/linter-values.yaml
+    - name: Helm-install the test fixtures and fill lagoon-test/ci/linter-values.yaml (needs-testing)
       if: |
-        (steps.list-changed.outputs.changed == 'true') ||
+        (steps.list-changed.outputs.changed == 'true' && !contains(github.event.pull_request.labels.*.name, 'next-release')) ||
         (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 }}]
 
+    - name: Helm-install the test fixtures and fill lagoon-test/ci/linter-values.yaml (next-release)
+      if: |
+        (steps.list-changed.outputs.changed == 'true') &&
+        (contains(github.event.pull_request.labels.*.name, 'next-release'))
+      run: |
+        yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' ./charts/lagoon-core/ci/linter-values.yaml ./charts/lagoon-core/ci/testlagoon-main-override.yaml
+        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
+      
     - name: Free up some disk space
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
-        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
+        (contains(github.event.pull_request.labels.*.name, 'needs-testing')) ||
+        (contains(github.event.pull_request.labels.*.name, 'next-release'))
       run: docker system prune -f -a --volumes
 
     - name: Run chart-testing (install) on lagoon-test
       if: |
         (steps.list-changed.outputs.changed == 'true') ||
-        (contains(github.event.pull_request.labels.*.name, 'needs-testing'))
+        (contains(github.event.pull_request.labels.*.name, 'needs-testing')) ||
+        (contains(github.event.pull_request.labels.*.name, 'next-release'))
       run: |
         ct lint --config ./test-suite-run.ct.yaml
         ct install --config ./test-suite-run.ct.yaml --helm-extra-args "--timeout 60m"