Skip to content

Commit 982e0b9

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #388 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 77ca9f4 + aa36335 commit 982e0b9

File tree

1,505 files changed

+102288
-32661
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,505 files changed

+102288
-32661
lines changed

‎.bingo/Variables.mk

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
2323
@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
2424
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
2525

26-
CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.17.3
26+
CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.18.0
2727
$(CONTROLLER_GEN): $(BINGO_DIR)/controller-gen.mod
2828
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
29-
@echo "(re)installing $(GOBIN)/controller-gen-v0.17.3"
30-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.17.3 "sigs.k8s.io/controller-tools/cmd/controller-gen"
29+
@echo "(re)installing $(GOBIN)/controller-gen-v0.18.0"
30+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.18.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
3131

3232
CRD_DIFF := $(GOBIN)/crd-diff-v0.2.0
3333
$(CRD_DIFF): $(BINGO_DIR)/crd-diff.mod
@@ -41,23 +41,23 @@ $(CRD_REF_DOCS): $(BINGO_DIR)/crd-ref-docs.mod
4141
@echo "(re)installing $(GOBIN)/crd-ref-docs-v0.1.0"
4242
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=crd-ref-docs.mod -o=$(GOBIN)/crd-ref-docs-v0.1.0 "github.com/elastic/crd-ref-docs"
4343

44-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.64.6
44+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.1.6
4545
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
4646
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
47-
@echo "(re)installing $(GOBIN)/golangci-lint-v1.64.6"
48-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.64.6 "github.com/golangci/golangci-lint/cmd/golangci-lint"
47+
@echo "(re)installing $(GOBIN)/golangci-lint-v2.1.6"
48+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.1.6 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
4949

5050
GORELEASER := $(GOBIN)/goreleaser-v1.26.2
5151
$(GORELEASER): $(BINGO_DIR)/goreleaser.mod
5252
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
5353
@echo "(re)installing $(GOBIN)/goreleaser-v1.26.2"
5454
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=goreleaser.mod -o=$(GOBIN)/goreleaser-v1.26.2 "github.com/goreleaser/goreleaser"
5555

56-
KIND := $(GOBIN)/kind-v0.27.0
56+
KIND := $(GOBIN)/kind-v0.29.0
5757
$(KIND): $(BINGO_DIR)/kind.mod
5858
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
59-
@echo "(re)installing $(GOBIN)/kind-v0.27.0"
60-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.27.0 "sigs.k8s.io/kind"
59+
@echo "(re)installing $(GOBIN)/kind-v0.29.0"
60+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.29.0 "sigs.k8s.io/kind"
6161

6262
KUSTOMIZE := $(GOBIN)/kustomize-v5.6.0
6363
$(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod
@@ -77,9 +77,9 @@ $(OPM): $(BINGO_DIR)/opm.mod
7777
@echo "(re)installing $(GOBIN)/opm-v1.51.0"
7878
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=opm.mod -o=$(GOBIN)/opm-v1.51.0 "github.com/operator-framework/operator-registry/cmd/opm"
7979

80-
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20250304084143-6eb011f4f89e
80+
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20250620151452-b9a9ca01fd37
8181
$(SETUP_ENVTEST): $(BINGO_DIR)/setup-envtest.mod
8282
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
83-
@echo "(re)installing $(GOBIN)/setup-envtest-v0.0.0-20250304084143-6eb011f4f89e"
84-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20250304084143-6eb011f4f89e "sigs.k8s.io/controller-runtime/tools/setup-envtest"
83+
@echo "(re)installing $(GOBIN)/setup-envtest-v0.0.0-20250620151452-b9a9ca01fd37"
84+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20250620151452-b9a9ca01fd37 "sigs.k8s.io/controller-runtime/tools/setup-envtest"
8585

‎.bingo/controller-gen.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.23.4
5+
toolchain go1.24.3
66

7-
require sigs.k8s.io/controller-tools v0.17.3 // cmd/controller-gen
7+
require sigs.k8s.io/controller-tools v0.18.0 // cmd/controller-gen

0 commit comments

Comments
 (0)