Skip to content

Commit 3b01b7b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1029 from openshift-bot/synchronize-upstream
NO-ISSUE: Synchronize From Upstream Repositories
2 parents 79b5612 + 25a4959 commit 3b01b7b

File tree

30 files changed

+759
-343
lines changed

30 files changed

+759
-343
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openshift/operator-framework-olm
22

3-
go 1.23.6
3+
go 1.24.3
44

55
require (
66
github.com/blang/semver/v4 v4.0.0
@@ -174,7 +174,7 @@ require (
174174
github.com/proglottis/gpgme v0.1.4 // indirect
175175
github.com/prometheus/client_golang v1.22.0 // indirect
176176
github.com/prometheus/client_model v0.6.2 // indirect
177-
github.com/prometheus/common v0.64.0 // indirect
177+
github.com/prometheus/common v0.65.0 // indirect
178178
github.com/prometheus/procfs v0.15.1 // indirect
179179
github.com/rivo/uniseg v0.4.7 // indirect
180180
github.com/russross/blackfriday/v2 v2.1.0 // indirect

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,8 +2052,8 @@ github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvM
20522052
github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
20532053
github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
20542054
github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
2055-
github.com/prometheus/common v0.64.0 h1:pdZeA+g617P7oGv1CzdTzyeShxAGrTBsolKNOLQPGO4=
2056-
github.com/prometheus/common v0.64.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
2055+
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
2056+
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
20572057
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
20582058
github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
20592059
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=

‎staging/operator-lifecycle-manager/.bingo/Variables.mk

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,29 @@ $(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-
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.63.4
26+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.64.8
2727
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.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)/golangci-lint-v1.63.4"
30-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.63.4 "github.com/golangci/golangci-lint/cmd/golangci-lint"
29+
@echo "(re)installing $(GOBIN)/golangci-lint-v1.64.8"
30+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.64.8 "github.com/golangci/golangci-lint/cmd/golangci-lint"
3131

32-
HELM := $(GOBIN)/helm-v3.16.4
32+
HELM := $(GOBIN)/helm-v3.18.3
3333
$(HELM): $(BINGO_DIR)/helm.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)/helm-v3.16.4"
36-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm.mod -o=$(GOBIN)/helm-v3.16.4 "helm.sh/helm/v3/cmd/helm"
35+
@echo "(re)installing $(GOBIN)/helm-v3.18.3"
36+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm.mod -o=$(GOBIN)/helm-v3.18.3 "helm.sh/helm/v3/cmd/helm"
3737

38-
KIND := $(GOBIN)/kind-v0.26.0
38+
KIND := $(GOBIN)/kind-v0.29.0
3939
$(KIND): $(BINGO_DIR)/kind.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)/kind-v0.26.0"
42-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.26.0 "sigs.k8s.io/kind"
41+
@echo "(re)installing $(GOBIN)/kind-v0.29.0"
42+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.29.0 "sigs.k8s.io/kind"
4343

44-
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20250109154033-1de5a3e8bae9
44+
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20250620151452-b9a9ca01fd37
4545
$(SETUP_ENVTEST): $(BINGO_DIR)/setup-envtest.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)/setup-envtest-v0.0.0-20250109154033-1de5a3e8bae9"
48-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20250109154033-1de5a3e8bae9 "sigs.k8s.io/controller-runtime/tools/setup-envtest"
47+
@echo "(re)installing $(GOBIN)/setup-envtest-v0.0.0-20250620151452-b9a9ca01fd37"
48+
@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"
4949

5050
YQ := $(GOBIN)/yq-v3.0.0-20201202084205-8846255d1c37
5151
$(YQ): $(BINGO_DIR)/yq.mod

‎staging/operator-lifecycle-manager/.bingo/golangci-lint.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.22.1
3+
go 1.23.0
44

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

7-
require github.com/golangci/golangci-lint v1.63.4 // cmd/golangci-lint
7+
require github.com/golangci/golangci-lint v1.64.8 // cmd/golangci-lint

0 commit comments

Comments
 (0)