Skip to content

Commit 0ef4548

Browse files
perdasilvaPer Goncalves da Silva
perdasilva
and
Per Goncalves da Silva
committed
🌱 cleanup/tools (#3285)
* move orthogonal tools to bingo Signed-off-by: Per Goncalves da Silva <[email protected]> * update vendor Signed-off-by: Per Goncalves da Silva <[email protected]> * remove no longer needed Dockerfile.goreleaser Signed-off-by: Per Goncalves da Silva <[email protected]> --------- Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: 556637d4144fb782e93c207f55975b743ec2d419 Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 475f4e1 commit 0ef4548

File tree

324 files changed

+36365
-10670
lines changed

Some content is hidden

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

324 files changed

+36365
-10670
lines changed

‎go.mod

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.19
55
require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/go-bindata/go-bindata/v3 v3.1.3
8-
github.com/go-logr/logr v1.3.0
8+
github.com/go-logr/logr v1.4.1
99
github.com/golang/mock v1.6.0
1010
github.com/googleapis/gnostic v0.5.5
1111
github.com/grpc-ecosystem/grpc-health-probe v0.4.11
@@ -33,16 +33,12 @@ require (
3333
sigs.k8s.io/controller-tools v0.8.0
3434
)
3535

36-
replace google.golang.org/grpc => google.golang.org/grpc v1.40.0
36+
// replace google.golang.org/grpc => google.golang.org/grpc v1.40.0
3737

3838
replace (
39-
go.opentelemetry.io/contrib => go.opentelemetry.io/contrib v0.20.0
4039
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0
4140
go.opentelemetry.io/otel/exporters/otlp => go.opentelemetry.io/otel/exporters/otlp v0.20.0
4241
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.20.0
43-
go.opentelemetry.io/otel/oteltest => go.opentelemetry.io/otel/oteltest v0.20.0
44-
go.opentelemetry.io/otel/sdk/export/metric => go.opentelemetry.io/otel/sdk/export/metric v0.20.0
45-
go.opentelemetry.io/otel/sdk/metric => go.opentelemetry.io/otel/sdk/metric v0.20.0
4642
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v0.20.0
4743
go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.7.0
4844
)
@@ -137,8 +133,8 @@ require (
137133
github.com/huandu/xstrings v1.3.2 // indirect
138134
github.com/imdario/mergo v0.3.12 // indirect
139135
github.com/inconshreveable/mousetrap v1.1.0 // indirect
140-
github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645 // indirect
141-
github.com/itchyny/gojq v0.11.0 // indirect
136+
github.com/itchyny/gojq v0.12.15 // indirect
137+
github.com/itchyny/timefmt-go v0.1.5 // indirect
142138
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
143139
github.com/jmoiron/sqlx v1.3.4 // indirect
144140
github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d // indirect
@@ -149,13 +145,12 @@ require (
149145
github.com/kylelemons/godebug v1.1.0 // indirect
150146
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
151147
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
152-
github.com/lestrrat-go/strftime v1.0.1 // indirect
153148
github.com/lib/pq v1.10.7 // indirect
154149
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
155150
github.com/mailru/easyjson v0.7.7 // indirect
156151
github.com/mattn/go-colorable v0.1.13 // indirect
157-
github.com/mattn/go-isatty v0.0.17 // indirect
158-
github.com/mattn/go-runewidth v0.0.9 // indirect
152+
github.com/mattn/go-isatty v0.0.20 // indirect
153+
github.com/mattn/go-runewidth v0.0.15 // indirect
159154
github.com/mattn/go-sqlite3 v1.14.16 // indirect
160155
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
161156
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -178,14 +173,14 @@ require (
178173
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
179174
github.com/openshift/cluster-policy-controller v0.0.0-20230217170320-ac01e3463245 // indirect
180175
github.com/otiai10/copy v1.2.0 // indirect
181-
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 // indirect
182176
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
183177
github.com/pkg/errors v0.9.1 // indirect
184178
github.com/pmezard/go-difflib v1.0.0 // indirect
185179
github.com/prometheus/client_golang v1.12.2 // indirect
186180
github.com/prometheus/client_model v0.2.0 // indirect
187181
github.com/prometheus/common v0.32.1 // indirect
188182
github.com/prometheus/procfs v0.7.3 // indirect
183+
github.com/rivo/uniseg v0.4.7 // indirect
189184
github.com/rubenv/sql-migrate v1.1.1 // indirect
190185
github.com/russross/blackfriday v1.5.2 // indirect
191186
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -225,7 +220,7 @@ require (
225220
golang.org/x/net v0.19.0 // indirect
226221
golang.org/x/oauth2 v0.12.0 // indirect
227222
golang.org/x/sync v0.3.0 // indirect
228-
golang.org/x/sys v0.15.0 // indirect
223+
golang.org/x/sys v0.18.0 // indirect
229224
golang.org/x/term v0.15.0 // indirect
230225
golang.org/x/text v0.14.0 // indirect
231226
golang.org/x/time v0.3.0 // indirect

‎go.sum

Lines changed: 64 additions & 31 deletions
Large diffs are not rendered by default.

‎staging/operator-lifecycle-manager/.bingo/.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
# Ignore everything
3+
*
4+
5+
# But not these files:
6+
!.gitignore
7+
!*.mod
8+
!*.sum
9+
!README.md
10+
!Variables.mk
11+
!variables.env
12+
13+
*tmp.mod

‎staging/operator-lifecycle-manager/.bingo/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Project Development Dependencies.
2+
3+
This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by https://github.com/bwplotka/bingo.
4+
5+
* Run `bingo get` to install all tools having each own module file in this directory.
6+
* Run `bingo get <tool>` to install <tool> that have own module file in this directory.
7+
* For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $(<upper case tool name>) variable where <tool> is the .bingo/<tool>.mod.
8+
* For shell: Run `source .bingo/variables.env` to source all environment variable for each tool.
9+
* For go: Import `.bingo/variables.go` to for variable names.
10+
* See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies.
11+
12+
## Requirements
13+
14+
* Go 1.14+

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.9. DO NOT EDIT.
2+
# All tools are designed to be build inside $GOBIN.
3+
BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
4+
GOPATH ?= $(shell go env GOPATH)
5+
GOBIN ?= $(firstword $(subst :, ,${GOPATH}))/bin
6+
GO ?= $(shell which go)
7+
8+
# Below generated variables ensure that every time a tool under each variable is invoked, the correct version
9+
# will be used; reinstalling only if needed.
10+
# For example for bingo variable:
11+
#
12+
# In your main Makefile (for non array binaries):
13+
#
14+
#include .bingo/Variables.mk # Assuming -dir was set to .bingo .
15+
#
16+
#command: $(BINGO)
17+
# @echo "Running bingo"
18+
# @$(BINGO) <flags/args..>
19+
#
20+
BINGO := $(GOBIN)/bingo-v0.9.0
21+
$(BINGO): $(BINGO_DIR)/bingo.mod
22+
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
23+
@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
24+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
25+
26+
GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.59.0
27+
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
28+
@# 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.59.0"
30+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.59.0 "github.com/golangci/golangci-lint/cmd/golangci-lint"
31+
32+
HELM := $(GOBIN)/helm-v3.15.1
33+
$(HELM): $(BINGO_DIR)/helm.mod
34+
@# 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.15.1"
36+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm.mod -o=$(GOBIN)/helm-v3.15.1 "helm.sh/helm/v3/cmd/helm"
37+
38+
KIND := $(GOBIN)/kind-v0.23.0
39+
$(KIND): $(BINGO_DIR)/kind.mod
40+
@# 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.23.0"
42+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.23.0 "sigs.k8s.io/kind"
43+
44+
SETUP_ENVTEST := $(GOBIN)/setup-envtest-v0.0.0-20240522175850-2e9781e9fc60
45+
$(SETUP_ENVTEST): $(BINGO_DIR)/setup-envtest.mod
46+
@# 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-20240522175850-2e9781e9fc60"
48+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=setup-envtest.mod -o=$(GOBIN)/setup-envtest-v0.0.0-20240522175850-2e9781e9fc60 "sigs.k8s.io/controller-runtime/tools/setup-envtest"
49+
50+
YQ := $(GOBIN)/yq-v3.0.0-20201202084205-8846255d1c37
51+
$(YQ): $(BINGO_DIR)/yq.mod
52+
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
53+
@echo "(re)installing $(GOBIN)/yq-v3.0.0-20201202084205-8846255d1c37"
54+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=yq.mod -o=$(GOBIN)/yq-v3.0.0-20201202084205-8846255d1c37 "github.com/mikefarah/yq/v3"
55+

‎staging/operator-lifecycle-manager/.bingo/bingo.mod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
2+
3+
go 1.22.0
4+
5+
toolchain go1.22.3
6+
7+
require github.com/bwplotka/bingo v0.9.0

‎staging/operator-lifecycle-manager/.bingo/bingo.sum

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
2+
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
3+
github.com/bwplotka/bingo v0.9.0 h1:slnsdJYExR4iRalHR6/ZiYnr9vSazOuFGmc2LdX293g=
4+
github.com/bwplotka/bingo v0.9.0/go.mod h1:GxC/y/xbmOK5P29cn+B3HuOSw0s2gruddT3r+rDizDw=
5+
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
6+
github.com/efficientgo/core v1.0.0-rc.0 h1:jJoA0N+C4/knWYVZ6GrdHOtDyrg8Y/TR4vFpTaqTsqs=
7+
github.com/efficientgo/core v1.0.0-rc.0/go.mod h1:kQa0V74HNYMfuJH6jiPiwNdpWXl4xd/K4tzlrcvYDQI=
8+
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
9+
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
10+
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
11+
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
12+
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
13+
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
14+
github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
15+
github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
16+
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
17+
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
18+
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
19+
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
20+
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
21+
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
22+
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
23+
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
24+
golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
25+
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
26+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
27+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
28+
mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=
29+
mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=

‎staging/operator-lifecycle-manager/.bingo/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.

‎staging/operator-lifecycle-manager/.bingo/golangci-lint.mod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
2+
3+
go 1.22.0
4+
5+
toolchain go1.22.3
6+
7+
require github.com/golangci/golangci-lint v1.59.0 // cmd/golangci-lint

0 commit comments

Comments
 (0)