Skip to content

Commit da9d3f0

Browse files
committed
Revert "Upgrade compatible bingo binaries ( kind/kustomize/opm/envtest ) (operator-framework#2306)"
This reverts commit b470947.
1 parent 9530175 commit da9d3f0

File tree

6 files changed

+3177
-32
lines changed

6 files changed

+3177
-32
lines changed

.bingo/Variables.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ 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.
8383
@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"
84+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -tags=containers_image_openpgp -ldflags=-X=github.com/operator-framework/operator-sdk/internal/version.Version=v1.41.1 -mod=mod -modfile=operator-sdk.mod -o=$(GOBIN)/operator-sdk-v1.41.1 "github.com/operator-framework/operator-sdk/cmd/operator-sdk"
8585

8686
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.
8989
@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"
90+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -tags=containers_image_openpgp -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/operator-sdk.mod

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

3-
go 1.23.4
3+
go 1.24.3
4+
5+
toolchain go1.24.6
46

57
replace github.com/containerd/containerd => github.com/containerd/containerd v1.4.11
68

79
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
810

911
replace github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0
1012

11-
require github.com/operator-framework/operator-sdk v1.39.1 // cmd/operator-sdk -ldflags=-X=github.com/operator-framework/operator-sdk/internal/version.Version=v1.34.1
13+
require github.com/operator-framework/operator-sdk v1.41.1 // cmd/operator-sdk -tags=containers_image_openpgp -ldflags=-X=github.com/operator-framework/operator-sdk/internal/version.Version=v1.41.1

0 commit comments

Comments
 (0)