From 77553e98febc183bfadfcbd9ee88193fc1d3166d Mon Sep 17 00:00:00 2001 From: Adam Kaplan Date: Wed, 1 Nov 2023 17:27:31 -0400 Subject: [PATCH] Set minKubeVersion to 1.24 Update KinD to latest released version (v0.20.0) and use the supported v1.24 k8s node version from the corresponding release note. The current Tekton operator on OperatorHub does not support k8s 1.25 or higher. This also sets the minKubeVersion to 1.24.0 on the operator CSV so the version we test with and the min supported version are aligned. See https://github.com/tektoncd/operator/issues/1493. --- .github/workflows/ci.yml | 7 +++++-- .../shipwright-operator.clusterserviceversion.yaml | 1 + .../bases/shipwright-operator.clusterserviceversion.yaml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4934e54..b9733cfe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,10 @@ jobs: fail-fast: false matrix: kubernetes: - - v1.23.13 + # Kubernetes version must match a built KinD node image. + # See release notes in https://github.com/kubernetes-sigs/kind/releases for supported + # node image versions. + - v1.24.15 max-parallel: 2 runs-on: ubuntu-latest steps: @@ -74,7 +77,7 @@ jobs: - name: Create KinD cluster uses: helm/kind-action@v1 with: - version: v0.17.0 + version: v0.20.0 node_image: kindest/node:${{ matrix.kubernetes }} cluster_name: kind config: test/kind/config.yaml diff --git a/bundle/manifests/shipwright-operator.clusterserviceversion.yaml b/bundle/manifests/shipwright-operator.clusterserviceversion.yaml index 21b7cd0d..749d1a9f 100644 --- a/bundle/manifests/shipwright-operator.clusterserviceversion.yaml +++ b/bundle/manifests/shipwright-operator.clusterserviceversion.yaml @@ -880,6 +880,7 @@ spec: - email: shipwright-dev@lists.shipwright.io name: The Shipwright Contributors maturity: alpha + minKubeVersion: 1.24.0 provider: name: The Shipwright Contributors url: https://shipwright.io diff --git a/config/manifests/bases/shipwright-operator.clusterserviceversion.yaml b/config/manifests/bases/shipwright-operator.clusterserviceversion.yaml index 4bc93118..dd6c759f 100644 --- a/config/manifests/bases/shipwright-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/shipwright-operator.clusterserviceversion.yaml @@ -224,6 +224,7 @@ spec: - email: shipwright-dev@lists.shipwright.io name: The Shipwright Contributors maturity: alpha + minKubeVersion: 1.24.0 provider: name: The Shipwright Contributors url: https://shipwright.io