Skip to content

Commit 99e740d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #546 from tmshort/synchronize
OCPBUGS-62942: Synchronize from Upstream
2 parents 6d95141 + f5aab1b commit 99e740d

File tree

32 files changed

+993
-3710
lines changed

32 files changed

+993
-3710
lines changed

‎.bingo/Variables.mk‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ $(CONTROLLER_GEN): $(BINGO_DIR)/controller-gen.mod
2929
@echo "(re)installing $(GOBIN)/controller-gen-v0.19.0"
3030
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.19.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
3131

32-
CRD_DIFF := $(GOBIN)/crd-diff-v0.2.0
32+
CRD_DIFF := $(GOBIN)/crd-diff-v0.5.0
3333
$(CRD_DIFF): $(BINGO_DIR)/crd-diff.mod
3434
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
35-
@echo "(re)installing $(GOBIN)/crd-diff-v0.2.0"
36-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=crd-diff.mod -o=$(GOBIN)/crd-diff-v0.2.0 "github.com/everettraven/crd-diff"
35+
@echo "(re)installing $(GOBIN)/crd-diff-v0.5.0"
36+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=crd-diff.mod -o=$(GOBIN)/crd-diff-v0.5.0 "sigs.k8s.io/crdify"
3737

38-
CRD_REF_DOCS := $(GOBIN)/crd-ref-docs-v0.1.0
38+
CRD_REF_DOCS := $(GOBIN)/crd-ref-docs-v0.2.0
3939
$(CRD_REF_DOCS): $(BINGO_DIR)/crd-ref-docs.mod
4040
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
41-
@echo "(re)installing $(GOBIN)/crd-ref-docs-v0.1.0"
42-
@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"
41+
@echo "(re)installing $(GOBIN)/crd-ref-docs-v0.2.0"
42+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=crd-ref-docs.mod -o=$(GOBIN)/crd-ref-docs-v0.2.0 "github.com/elastic/crd-ref-docs"
4343

4444
GOJQ := $(GOBIN)/gojq-v0.12.17
4545
$(GOJQ): $(BINGO_DIR)/gojq.mod
@@ -71,23 +71,23 @@ $(KIND): $(BINGO_DIR)/kind.mod
7171
@echo "(re)installing $(GOBIN)/kind-v0.30.0"
7272
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.30.0 "sigs.k8s.io/kind"
7373

74-
KUSTOMIZE := $(GOBIN)/kustomize-v5.6.0
74+
KUSTOMIZE := $(GOBIN)/kustomize-v5.7.1
7575
$(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod
7676
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
77-
@echo "(re)installing $(GOBIN)/kustomize-v5.6.0"
78-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v5.6.0 "sigs.k8s.io/kustomize/kustomize/v5"
77+
@echo "(re)installing $(GOBIN)/kustomize-v5.7.1"
78+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kustomize.mod -o=$(GOBIN)/kustomize-v5.7.1 "sigs.k8s.io/kustomize/kustomize/v5"
7979

80-
OPERATOR_SDK := $(GOBIN)/operator-sdk-v1.39.1
80+
OPERATOR_SDK := $(GOBIN)/operator-sdk-v1.41.1
8181
$(OPERATOR_SDK): $(BINGO_DIR)/operator-sdk.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)/operator-sdk-v1.39.1"
84-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -ldflags=-X=github.com/operator-framework/operator-sdk/internal/version.Version=v1.34.1 -mod=mod -modfile=operator-sdk.mod -o=$(GOBIN)/operator-sdk-v1.39.1 "github.com/operator-framework/operator-sdk/cmd/operator-sdk"
83+
@echo "(re)installing $(GOBIN)/operator-sdk-v1.41.1"
84+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=operator-sdk.mod -o=$(GOBIN)/operator-sdk-v1.41.1 "github.com/operator-framework/operator-sdk/cmd/operator-sdk"
8585

86-
OPM := $(GOBIN)/opm-v1.51.0
86+
OPM := $(GOBIN)/opm-v1.60.0
8787
$(OPM): $(BINGO_DIR)/opm.mod
8888
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
89-
@echo "(re)installing $(GOBIN)/opm-v1.51.0"
90-
@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"
89+
@echo "(re)installing $(GOBIN)/opm-v1.60.0"
90+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=opm.mod -o=$(GOBIN)/opm-v1.60.0 "github.com/operator-framework/operator-registry/cmd/opm"
9191

9292
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20250620151452-b9a9ca01fd37
9393
$(SETUP_ENVTEST): $(BINGO_DIR)/setup-envtest.mod

‎.bingo/controller-gen.mod‎

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

3-
go 1.24.0
4-
5-
toolchain go1.24.3
3+
go 1.24.6
64

75
require sigs.k8s.io/controller-tools v0.19.0 // cmd/controller-gen

‎.bingo/controller-gen.sum‎

Lines changed: 0 additions & 266 deletions
Large diffs are not rendered by default.

‎.bingo/crd-diff.mod‎

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

3-
go 1.22.5
3+
go 1.24.6
44

5-
require github.com/everettraven/crd-diff v0.2.0
5+
require sigs.k8s.io/crdify v0.5.0

0 commit comments

Comments
 (0)