From ad947cd20fb3267535004119153228e334002cdd Mon Sep 17 00:00:00 2001 From: Mikhail Fedosin Date: Thu, 25 Sep 2025 17:27:40 +0200 Subject: [PATCH] build: bump development and testing tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- .github/workflows/golangci-lint.yml | 4 ++-- Makefile | 20 +++++++++---------- ...rator.cluster.x-k8s.io_addonproviders.yaml | 2 +- ...r.cluster.x-k8s.io_bootstrapproviders.yaml | 2 +- ...luster.x-k8s.io_controlplaneproviders.yaml | 2 +- ...erator.cluster.x-k8s.io_coreproviders.yaml | 2 +- ...ster.x-k8s.io_infrastructureproviders.yaml | 2 +- ...erator.cluster.x-k8s.io_ipamproviders.yaml | 2 +- ...er.x-k8s.io_runtimeextensionproviders.yaml | 2 +- internal/controller/manifests_downloader.go | 2 +- test/e2e/resources/full-chart-install.yaml | 14 ++++++------- test/framework/all_type_helpers.go | 4 +++- 12 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index ce39f35b3..e28d4632e 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -23,11 +23,11 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # tag=v8.0.0 with: - version: v2.1.0 + version: v2.5.0 args: --timeout 15m - name: golangci-lint-test uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # tag=v8.0.0 with: - version: v2.1.0 + version: v2.5.0 args: --build-tags e2e --timeout 15m working-directory: test diff --git a/Makefile b/Makefile index a0eb31393..ce00a8034 100644 --- a/Makefile +++ b/Makefile @@ -79,15 +79,15 @@ IMAGE_REVIEWERS ?= $(shell ./hack/get-project-maintainers.sh) # Binaries. # Need to use abspath so we can invoke these from subdirectories -CONTROLLER_GEN_VER := v0.16.1 +CONTROLLER_GEN_VER := v0.19.0 CONTROLLER_GEN_BIN := controller-gen CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER) -GOLANGCI_LINT_VER := v2.0.2 +GOLANGCI_LINT_VER := v2.5.0 GOLANGCI_LINT_BIN := golangci-lint GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER) -KUSTOMIZE_VER := v5.3.0 +KUSTOMIZE_VER := v5.7.1 KUSTOMIZE_BIN := kustomize KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER) @@ -99,11 +99,11 @@ SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60 SETUP_ENVTEST_BIN := setup-envtest SETUP_ENVTEST := $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER) -GOTESTSUM_VER := v1.11.0 +GOTESTSUM_VER := v1.13.0 GOTESTSUM_BIN := gotestsum GOTESTSUM := $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER) -GINKGO_VER := v2.22.2 +GINKGO_VER := v2.25.3 GINKGO_BIN := ginkgo GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER) @@ -115,11 +115,11 @@ GO_APIDIFF_VER := v0.8.3 GO_APIDIFF_BIN := go-apidiff GO_APIDIFF := $(TOOLS_BIN_DIR)/$(GO_APIDIFF_BIN)-$(GO_APIDIFF_VER) -HELM_VER := v3.14.4 +HELM_VER := v3.19.0 HELM_BIN := helm HELM := $(TOOLS_BIN_DIR)/$(HELM_BIN)-$(HELM_VER) -YQ_VER := v4.35.2 +YQ_VER := v4.47.2 YQ_BIN := yq YQ := $(TOOLS_BIN_DIR)/$(YQ_BIN)-$(YQ_VER) @@ -127,11 +127,11 @@ KPROMO_VER := v4.0.5 KPROMO_BIN := kpromo KPROMO := $(TOOLS_BIN_DIR)/$(KPROMO_BIN)-$(KPROMO_VER) -CONVERSION_GEN_VER := v0.29.2 +CONVERSION_GEN_VER := v0.34.1 CONVERSION_GEN_BIN := conversion-gen CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER) -CONVERSION_VERIFIER_VER := v1.7.0 +CONVERSION_VERIFIER_VER := v1.11.1 CONVERSION_VERIFIER_BIN := conversion-verifier CONVERSION_VERIFIER := $(TOOLS_BIN_DIR)/$(CONVERSION_VERIFIER_BIN)-$(CONVERSION_VERIFIER_VER) @@ -157,7 +157,7 @@ CONTROLLER_IMG_TAG ?= $(CONTROLLER_IMG)-$(ARCH):$(TAG) LDFLAGS := $(shell $(ROOT)/hack/version.sh) # Default cert-manager version -CERT_MANAGER_VERSION ?= v1.15.1 +CERT_MANAGER_VERSION ?= v1.16.1 # E2E configuration GINKGO_NOCOLOR ?= false diff --git a/config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml index d25535924..90abf58a3 100644 --- a/config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml +++ b/config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 name: addonproviders.operator.cluster.x-k8s.io spec: group: operator.cluster.x-k8s.io diff --git a/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml index 31aee2f86..90d25a080 100644 --- a/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml +++ b/config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 name: bootstrapproviders.operator.cluster.x-k8s.io spec: group: operator.cluster.x-k8s.io diff --git a/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml index b9b631bfe..fbd470e1c 100644 --- a/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml +++ b/config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 name: controlplaneproviders.operator.cluster.x-k8s.io spec: group: operator.cluster.x-k8s.io diff --git a/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml index 50d79de0d..c748a8c7a 100644 --- a/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml +++ b/config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 name: coreproviders.operator.cluster.x-k8s.io spec: group: operator.cluster.x-k8s.io diff --git a/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml index 3e9e88fa5..d3c2f6b29 100644 --- a/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml +++ b/config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 name: infrastructureproviders.operator.cluster.x-k8s.io spec: group: operator.cluster.x-k8s.io diff --git a/config/crd/bases/operator.cluster.x-k8s.io_ipamproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_ipamproviders.yaml index 73004dcb2..34d48683e 100644 --- a/config/crd/bases/operator.cluster.x-k8s.io_ipamproviders.yaml +++ b/config/crd/bases/operator.cluster.x-k8s.io_ipamproviders.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 name: ipamproviders.operator.cluster.x-k8s.io spec: group: operator.cluster.x-k8s.io diff --git a/config/crd/bases/operator.cluster.x-k8s.io_runtimeextensionproviders.yaml b/config/crd/bases/operator.cluster.x-k8s.io_runtimeextensionproviders.yaml index a791fc157..1d949f3df 100644 --- a/config/crd/bases/operator.cluster.x-k8s.io_runtimeextensionproviders.yaml +++ b/config/crd/bases/operator.cluster.x-k8s.io_runtimeextensionproviders.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 name: runtimeextensionproviders.operator.cluster.x-k8s.io spec: group: operator.cluster.x-k8s.io diff --git a/internal/controller/manifests_downloader.go b/internal/controller/manifests_downloader.go index 8a5b31039..6a6d76f1b 100644 --- a/internal/controller/manifests_downloader.go +++ b/internal/controller/manifests_downloader.go @@ -229,7 +229,7 @@ func compressData(componentsBuf *bytes.Buffer, data []byte) (err error) { return fmt.Errorf("cannot compress data: %w", err) } - return + return nil } // decompressData takes a compressed data, and decompresses it. diff --git a/test/e2e/resources/full-chart-install.yaml b/test/e2e/resources/full-chart-install.yaml index f094ff605..7efd647a3 100644 --- a/test/e2e/resources/full-chart-install.yaml +++ b/test/e2e/resources/full-chart-install.yaml @@ -14,7 +14,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 helm.sh/resource-policy: keep labels: clusterctl.cluster.x-k8s.io/core: capi-operator @@ -3133,7 +3133,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 helm.sh/resource-policy: keep labels: clusterctl.cluster.x-k8s.io/core: capi-operator @@ -6252,7 +6252,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 helm.sh/resource-policy: keep labels: clusterctl.cluster.x-k8s.io/core: capi-operator @@ -9373,7 +9373,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 helm.sh/resource-policy: keep labels: clusterctl.cluster.x-k8s.io/core: capi-operator @@ -12492,7 +12492,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 helm.sh/resource-policy: keep labels: clusterctl.cluster.x-k8s.io/core: capi-operator @@ -15613,7 +15613,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 helm.sh/resource-policy: keep labels: clusterctl.cluster.x-k8s.io/core: capi-operator @@ -18732,7 +18732,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: 'default/capi-operator-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.19.0 helm.sh/resource-policy: keep labels: clusterctl.cluster.x-k8s.io/core: capi-operator diff --git a/test/framework/all_type_helpers.go b/test/framework/all_type_helpers.go index f38304509..d69655f62 100644 --- a/test/framework/all_type_helpers.go +++ b/test/framework/all_type_helpers.go @@ -225,7 +225,9 @@ func (h *HelmChart) Run(values map[string]string) (string, error) { fullCommand := append([]string{h.BinaryPath}, args...) klog.Infof("Executing: %s", fullCommand) - out, err := exec.Command(h.BinaryPath, args...).CombinedOutput() //nolint:gosec + ctx := context.Background() + + out, err := exec.CommandContext(ctx, h.BinaryPath, args...).CombinedOutput() //nolint:gosec if err != nil { return "", fmt.Errorf("failed to run helm %s: %w, output: %s", strings.Join(h.Commands.Strings(), " "), err, string(out)) }