Skip to content

Commit a97c3cf

Browse files
FedosinFedosin
committed
build: bump development and testing tools
Update various development, build, and testing tools to their latest versions: - controller-gen: v0.16.1 → v0.19.0 - golangci-lint: v2.1.0 → v2.5.0 - kustomize: v5.3.0 → v5.7.1 - gotestsum: v1.11.0 → v1.13.0 - ginkgo: v2.22.2 → v2.25.3 - helm: v3.14.4 → v3.19.0 - yq: v4.35.2 → v4.47.2 - conversion-gen: v0.29.2 → v0.34.1 - conversion-verifier: v1.7.0 → v1.11.1 - cert-manager: v1.15.1 → v1.16.1 Additionally, this commit includes minor code improvements: - Fix implicit return to explicit return nil in manifests_downloader.go - Add context to exec.CommandContext in test framework These updates ensure compatibility with latest tooling and address potential linting issues from newer versions.
1 parent fb2f897 commit a97c3cf

11 files changed

+23
-21
lines changed

‎.github/workflows/golangci-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
- name: golangci-lint
2424
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # tag=v8.0.0
2525
with:
26-
version: v2.1.0
26+
version: v2.5.0
2727
args: --timeout 15m
2828
- name: golangci-lint-test
2929
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # tag=v8.0.0
3030
with:
31-
version: v2.1.0
31+
version: v2.5.0
3232
args: --build-tags e2e --timeout 15m
3333
working-directory: test

‎Makefile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ IMAGE_REVIEWERS ?= $(shell ./hack/get-project-maintainers.sh)
7979

8080
# Binaries.
8181
# Need to use abspath so we can invoke these from subdirectories
82-
CONTROLLER_GEN_VER := v0.16.1
82+
CONTROLLER_GEN_VER := v0.19.0
8383
CONTROLLER_GEN_BIN := controller-gen
8484
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
8585

86-
GOLANGCI_LINT_VER := v2.0.2
86+
GOLANGCI_LINT_VER := v2.5.0
8787
GOLANGCI_LINT_BIN := golangci-lint
8888
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
8989

90-
KUSTOMIZE_VER := v5.3.0
90+
KUSTOMIZE_VER := v5.7.1
9191
KUSTOMIZE_BIN := kustomize
9292
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
9393

@@ -99,11 +99,11 @@ SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60
9999
SETUP_ENVTEST_BIN := setup-envtest
100100
SETUP_ENVTEST := $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER)
101101

102-
GOTESTSUM_VER := v1.11.0
102+
GOTESTSUM_VER := v1.13.0
103103
GOTESTSUM_BIN := gotestsum
104104
GOTESTSUM := $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER)
105105

106-
GINKGO_VER := v2.22.2
106+
GINKGO_VER := v2.25.3
107107
GINKGO_BIN := ginkgo
108108
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
109109

@@ -115,23 +115,23 @@ GO_APIDIFF_VER := v0.8.3
115115
GO_APIDIFF_BIN := go-apidiff
116116
GO_APIDIFF := $(TOOLS_BIN_DIR)/$(GO_APIDIFF_BIN)-$(GO_APIDIFF_VER)
117117

118-
HELM_VER := v3.14.4
118+
HELM_VER := v3.19.0
119119
HELM_BIN := helm
120120
HELM := $(TOOLS_BIN_DIR)/$(HELM_BIN)-$(HELM_VER)
121121

122-
YQ_VER := v4.35.2
122+
YQ_VER := v4.47.2
123123
YQ_BIN := yq
124124
YQ := $(TOOLS_BIN_DIR)/$(YQ_BIN)-$(YQ_VER)
125125

126126
KPROMO_VER := v4.0.5
127127
KPROMO_BIN := kpromo
128128
KPROMO := $(TOOLS_BIN_DIR)/$(KPROMO_BIN)-$(KPROMO_VER)
129129

130-
CONVERSION_GEN_VER := v0.29.2
130+
CONVERSION_GEN_VER := v0.34.1
131131
CONVERSION_GEN_BIN := conversion-gen
132132
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
133133

134-
CONVERSION_VERIFIER_VER := v1.7.0
134+
CONVERSION_VERIFIER_VER := v1.11.1
135135
CONVERSION_VERIFIER_BIN := conversion-verifier
136136
CONVERSION_VERIFIER := $(TOOLS_BIN_DIR)/$(CONVERSION_VERIFIER_BIN)-$(CONVERSION_VERIFIER_VER)
137137

@@ -157,7 +157,7 @@ CONTROLLER_IMG_TAG ?= $(CONTROLLER_IMG)-$(ARCH):$(TAG)
157157
LDFLAGS := $(shell $(ROOT)/hack/version.sh)
158158

159159
# Default cert-manager version
160-
CERT_MANAGER_VERSION ?= v1.15.1
160+
CERT_MANAGER_VERSION ?= v1.16.1
161161

162162
# E2E configuration
163163
GINKGO_NOCOLOR ?= false

‎config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: addonproviders.operator.cluster.x-k8s.io
88
spec:
99
group: operator.cluster.x-k8s.io

‎config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: bootstrapproviders.operator.cluster.x-k8s.io
88
spec:
99
group: operator.cluster.x-k8s.io

‎config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: controlplaneproviders.operator.cluster.x-k8s.io
88
spec:
99
group: operator.cluster.x-k8s.io

‎config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: coreproviders.operator.cluster.x-k8s.io
88
spec:
99
group: operator.cluster.x-k8s.io

‎config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: infrastructureproviders.operator.cluster.x-k8s.io
88
spec:
99
group: operator.cluster.x-k8s.io

‎config/crd/bases/operator.cluster.x-k8s.io_ipamproviders.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: ipamproviders.operator.cluster.x-k8s.io
88
spec:
99
group: operator.cluster.x-k8s.io

‎config/crd/bases/operator.cluster.x-k8s.io_runtimeextensionproviders.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: runtimeextensionproviders.operator.cluster.x-k8s.io
88
spec:
99
group: operator.cluster.x-k8s.io

‎internal/controller/manifests_downloader.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func compressData(componentsBuf *bytes.Buffer, data []byte) (err error) {
229229
return fmt.Errorf("cannot compress data: %w", err)
230230
}
231231

232-
return
232+
return nil
233233
}
234234

235235
// decompressData takes a compressed data, and decompresses it.

0 commit comments

Comments
 (0)