Skip to content

🌱 bump development and testing tools #896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2025
Merged

🌱 bump development and testing tools #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 10 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand All @@ -115,23 +115,23 @@ 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)

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)

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/operator.cluster.x-k8s.io_addonproviders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/operator.cluster.x-k8s.io_bootstrapproviders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/operator.cluster.x-k8s.io_controlplaneproviders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/operator.cluster.x-k8s.io_coreproviders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/operator.cluster.x-k8s.io_infrastructureproviders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/operator.cluster.x-k8s.io_ipamproviders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/operator.cluster.x-k8s.io_runtimeextensionproviders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/manifests_downloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
14 changes: 7 additions & 7 deletions test/e2e/resources/full-chart-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion test/framework/all_type_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down