Use the latest version in matrix as a default from Makefile

aenix-io · May 19, 2024 · bb36d47 · bb36d47
1 parent 46553e8
commit bb36d47
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/make-test-e2e.yaml b/.github/workflows/make-test-e2e.yaml
@@ -19,7 +19,7 @@ jobs:
             attribute: penultimate
           - version: 1.29.3
             attribute: previous
-          - version: 1.30.0
+          - version: default
             attribute: latest
     runs-on: ubuntu-22.04
     steps:
@@ -30,7 +30,13 @@ jobs:
       - uses: docker/setup-buildx-action@v3.3.0
       - uses: tale/kubectl-action@v1.4.0
         with:
-          kubectl-version: v1.30.0
+          kubectl-version: v1.30.1
           # Empty kubeconfig file
           base64-kube-config: "YXBpVmVyc2lvbjogdjEKa2luZDogQ29uZmlnCnByZWZlcmVuY2VzOiB7fQo="
-      - run: ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test-e2e
+      - run: |
+          if [ "${{ matrix.k8s.version }}" = "default" ]; then
+            # For latest version use default from Makefile
+            make test
+          else
+            ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test-e2e
+          fi
diff --git a/.github/workflows/make-test.yaml b/.github/workflows/make-test.yaml
@@ -19,12 +19,18 @@ jobs:
             attribute: penultimate
           - version: 1.29.3
             attribute: previous
-          - version: 1.30.0
+          - version: default
             attribute: latest
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4.1.6
       - uses: actions/setup-go@v5.0.1
         with:
           go-version: 1.22.3
-      - run: ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test
+      - run: |
+          if [ "${{ matrix.k8s.version }}" = "default" ]; then
+            # For latest version use default from Makefile
+            make test
+          else
+            ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test
+          fi
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 IMG ?= ghcr.io/aenix-io/etcd-operator:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 # renovate: datasource=github-tags depName=kubernetes/kubernetes
-ENVTEST_K8S_VERSION ?= v1.30.1
+ENVTEST_K8S_VERSION ?= v1.30.0
 ENVTEST_K8S_VERSION_TRIMMED_V = $(subst v,,$(ENVTEST_K8S_VERSION))
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)