Skip to content

Commit d7a6f5a

Browse files
authored
Use the latest version in matrix as a default from Makefile (#218)
1 parent 30a48c2 commit d7a6f5a

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

.github/workflows/make-test-e2e.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
attribute: penultimate
2020
- version: 1.29.3
2121
attribute: previous
22-
- version: 1.30.0
22+
- version: default
2323
attribute: latest
2424
runs-on: ubuntu-22.04
2525
steps:
@@ -30,7 +30,13 @@ jobs:
3030
- uses: docker/[email protected]
3131
- uses: tale/[email protected]
3232
with:
33-
kubectl-version: v1.30.0
33+
kubectl-version: v1.30.1
3434
# Empty kubeconfig file
3535
base64-kube-config: "YXBpVmVyc2lvbjogdjEKa2luZDogQ29uZmlnCnByZWZlcmVuY2VzOiB7fQo="
36-
- run: ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test-e2e
36+
- run: |
37+
if [ "${{ matrix.k8s.version }}" = "default" ]; then
38+
# For latest version use default from Makefile
39+
make test-e2e
40+
else
41+
ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test-e2e
42+
fi

.github/workflows/make-test.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@ jobs:
1919
attribute: penultimate
2020
- version: 1.29.3
2121
attribute: previous
22-
- version: 1.30.0
22+
- version: default
2323
attribute: latest
2424
runs-on: ubuntu-22.04
2525
steps:
2626
- uses: actions/[email protected]
2727
- uses: actions/[email protected]
2828
with:
2929
go-version: 1.22.3
30-
- run: ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test
30+
- run: |
31+
if [ "${{ matrix.k8s.version }}" = "default" ]; then
32+
# For latest version use default from Makefile
33+
make test
34+
else
35+
ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test
36+
fi

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
IMG ?= ghcr.io/aenix-io/etcd-operator:latest
44
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
55
# renovate: datasource=github-tags depName=kubernetes/kubernetes
6-
ENVTEST_K8S_VERSION ?= v1.30.1
6+
ENVTEST_K8S_VERSION ?= v1.30.0
77
ENVTEST_K8S_VERSION_TRIMMED_V = $(subst v,,$(ENVTEST_K8S_VERSION))
88

99
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)

0 commit comments

Comments
 (0)