From d7a6f5a7312196b602781cecc4497c9f3b3e1fb1 Mon Sep 17 00:00:00 2001
From: Oleg Kunitsyn <114359669+hiddenmarten@users.noreply.github.com>
Date: Sun, 19 May 2024 15:24:15 +0200
Subject: [PATCH] Use the latest version in matrix as a default from Makefile
 (#218)

---
 .github/workflows/make-test-e2e.yaml | 12 +++++++++---
 .github/workflows/make-test.yaml     | 10 ++++++++--
 Makefile                             |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/make-test-e2e.yaml b/.github/workflows/make-test-e2e.yaml
index d8573566..c277ca7b 100644
--- 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-e2e
+          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
index 19f857f4..94c4fe1c 100644
--- a/.github/workflows/make-test.yaml
+++ b/.github/workflows/make-test.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:
@@ -27,4 +27,10 @@ jobs:
       - 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
index cf7106e3..6efeb353 100644
--- 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)