Skip to content

Commit 6607a72

Browse files
committed
build(deps): bump tools version
1 parent e6ca567 commit 6607a72

File tree

4 files changed

+24
-25
lines changed

4 files changed

+24
-25
lines changed

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ jobs:
3838
- name: Run linter
3939
uses: golangci/golangci-lint-action@v6
4040
with:
41-
version: v1.61
41+
version: v1.63

.github/workflows/release.yml

+4-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Run linter
4242
uses: golangci/golangci-lint-action@v6
4343
with:
44-
version: v1.61
44+
version: v1.63
4545

4646
golang-test:
4747
name: Golang Test
@@ -79,23 +79,20 @@ jobs:
7979

8080
- name: Create KinD clustet pur
8181
env:
82-
KINDTEST_K8S_VERSION: ${{ matrix.k8s-version}}
82+
KIND_K8S_VERSION: ${{ matrix.k8s-version}}
8383
KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
84-
KIND_KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
8584
run: make kind-create
8685

8786
- name: Chainsaw test setup
8887
env:
89-
KINDTEST_K8S_VERSION: ${{ matrix.k8s-version }}
88+
KIND_K8S_VERSION: ${{ matrix.k8s-version }}
9089
KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
91-
KIND_KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
9290
run: make chainsaw-setup
9391

9492
- name: Test with Chainsaw
9593
env:
96-
KINDTEST_K8S_VERSION: ${{ matrix.k8s-version }}
94+
KIND_K8S_VERSION: ${{ matrix.k8s-version }}
9795
KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
98-
KIND_KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
9996
PRODUCT_VERSION: ${{ matrix.product-version }}
10097
run: make chainsaw-test
10198

.github/workflows/test.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,19 @@ jobs:
4444

4545
- name: Create KinD clustet pur
4646
env:
47-
KINDTEST_K8S_VERSION: ${{ matrix.k8s-version}}
47+
KIND_K8S_VERSION: ${{ matrix.k8s-version}}
4848
KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
49-
KIND_KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
5049
run: make kind-create
5150

5251
- name: Chainsaw test setup
5352
env:
54-
KINDTEST_K8S_VERSION: ${{ matrix.k8s-version }}
53+
KIND_K8S_VERSION: ${{ matrix.k8s-version }}
5554
KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
56-
KIND_KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
5755
run: make chainsaw-setup
5856

5957
- name: Test with Chainsaw
6058
env:
61-
KINDTEST_K8S_VERSION: ${{ matrix.k8s-version }}
59+
KIND_K8S_VERSION: ${{ matrix.k8s-version }}
6260
KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
63-
KIND_KUBECONFIG: kind-kubeconfig-${{ matrix.k8s-version }}
6461
PRODUCT_VERSION: ${{ matrix.product-version }}
6562
run: make chainsaw-test

Makefile

+16-11
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ HELM = $(LOCALBIN)/helm
182182
KIND = $(LOCALBIN)/kind
183183

184184
## Tool Versions
185-
KUSTOMIZE_VERSION ?= v5.5.0
186-
CONTROLLER_TOOLS_VERSION ?= v0.16.5
187-
ENVTEST_VERSION ?= release-0.19
188-
GOLANGCI_LINT_VERSION ?= v1.61.0
189-
HELM_VERSION ?= v3.16.2
190-
KIND_VERSION ?= v0.24.0
185+
KUSTOMIZE_VERSION ?= v5.6.0
186+
CONTROLLER_TOOLS_VERSION ?= v0.17.1
187+
ENVTEST_VERSION ?= release-0.20
188+
GOLANGCI_LINT_VERSION ?= v1.63.4
189+
HELM_VERSION ?= v3.17.0
190+
KIND_VERSION ?= v0.26.0
191191

192192
.PHONY: kustomize
193193
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
@@ -259,13 +259,18 @@ endif
259259
##@ Chainsaw-E2E
260260

261261
# Tool Versions
262-
KINDTEST_K8S_VERSION ?= 1.26.15
263-
CHAINSAW_VERSION ?= v0.2.11
262+
# KIND_K8S_VERSION refers to the version of k8s to be used by kind.
263+
# The version only effects e2e tests.
264+
# When run `make kind-create`, the version of k8s will be used to create the kind cluster,
265+
# and the target kubeconfig file will be named as `./kind-kubeconfig-$(KIND_K8S_VERSION)`.
266+
# So if you want to use the target cluster, to run `export KUBECONFIG=./kind-kubeconfig-$(KIND_K8S_VERSION)`.
267+
KIND_K8S_VERSION ?= 1.26.15
268+
CHAINSAW_VERSION ?= v0.2.12
264269
PRODUCT_VERSION ?= 3.1.3
265270

266-
KIND_IMAGE ?= kindest/node:v${KINDTEST_K8S_VERSION}
267-
KIND_KUBECONFIG ?= ./kind-kubeconfig-$(KINDTEST_K8S_VERSION)
268-
KIND_CLUSTER_NAME ?= ${PROJECT_NAME}-$(KINDTEST_K8S_VERSION)
271+
KIND_IMAGE ?= kindest/node:v${KIND_K8S_VERSION}
272+
KIND_KUBECONFIG ?= ./kind-kubeconfig-$(KIND_K8S_VERSION)
273+
KIND_CLUSTER_NAME ?= ${PROJECT_NAME}-$(KIND_K8S_VERSION)
269274
KIND_CONFIG ?= test/e2e/kind-config.yaml
270275

271276
CHAINSAW = $(LOCALBIN)/chainsaw

0 commit comments

Comments
 (0)