Skip to content

Commit 7915649

Browse files
bentitobentito
authored
OCPBUGS-30333: Move Helm to bingo dep and update it (#837)
* Add bingo for Helm dep * Add bingo for Helm dep - vendor changes Signed-off-by: Brett Tofel <[email protected]> * Rm debug statement Signed-off-by: Brett Tofel <[email protected]> * Sync bingo go version with toolchain go version Signed-off-by: Brett Tofel <[email protected]> * Some Go debugging lines to debug helm bin path Signed-off-by: Brett Tofel <[email protected]> * Add helm dependency to verify target Signed-off-by: Brett Tofel <[email protected]> * Move down the bingo include to protect early defs Signed-off-by: Brett Tofel <[email protected]> --------- Signed-off-by: Brett Tofel <[email protected]>
1 parent caef475 commit 7915649

File tree

1,255 files changed

+572
-290677
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,255 files changed

+572
-290677
lines changed

‎.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

‎.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+

‎.bingo/Variables.mk

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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 helm 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: $(HELM)
17+
# @echo "Running helm"
18+
# @$(HELM) <flags/args..>
19+
#
20+
HELM := $(GOBIN)/helm-v3.15.2
21+
$(HELM): $(BINGO_DIR)/helm.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)/helm-v3.15.2"
24+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm.mod -o=$(GOBIN)/helm-v3.15.2 "helm.sh/helm/v3/cmd/helm"
25+

‎.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.

‎.bingo/helm.mod

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
2+
3+
go 1.22.3
4+
5+
require helm.sh/helm/v3 v3.15.2 // cmd/helm

‎.bingo/helm.sum

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

‎.bingo/variables.env

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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+
# Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
4+
GOBIN=${GOBIN:=$(go env GOBIN)}
5+
6+
if [ -z "$GOBIN" ]; then
7+
GOBIN="$(go env GOPATH)/bin"
8+
fi
9+
10+
11+
HELM="${GOBIN}/helm-v3.15.2"
12+

‎Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,19 @@ REGISTRY_CMDS := $(addprefix bin/, $(shell ls staging/operator-registry/cmd | g
3636
# Default image tag for build/olm-container and build/registry-container
3737
IMG ?= test:test
3838

39+
# Tools #
40+
41+
# The tools required to build and test the project:
42+
# 1. .bingo/Variables.mk: tools that are orthogonal to the projects in this monorepo, e.g.
43+
# - helm
44+
# - yq
45+
46+
# bingo manages the type 1 tools. If
47+
# a) we don't want their dependencies affecting ours, and
48+
# b) the tool's version doesn't need to track closely with OLM
49+
# the tool goes here
50+
include .bingo/Variables.mk
51+
3952
# Phony prerequisite for targets that rely on the go build cache to determine staleness.
4053
.PHONY: FORCE
4154
FORCE:
@@ -172,6 +185,7 @@ verify-commits:
172185

173186
# Update scripts/sync_pop_candidate.sh if anything is changed in this recipe
174187
.PHONY: verify
188+
verify: $(HELM)
175189
verify:
176190
@echo "Checking for unstaged root vendor changes"
177191
$(MAKE) verify-vendor

‎go.mod

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ require (
2424
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
2525
google.golang.org/protobuf v1.34.2
2626
gopkg.in/yaml.v2 v2.4.0
27-
helm.sh/helm/v3 v3.14.4
2827
k8s.io/api v0.30.3
2928
k8s.io/apimachinery v0.30.3
3029
k8s.io/client-go v0.30.3
@@ -53,11 +52,6 @@ require (
5352
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
5453
github.com/BurntSushi/toml v1.3.2 // indirect
5554
github.com/MakeNowJust/heredoc v1.0.0 // indirect
56-
github.com/Masterminds/goutils v1.1.1 // indirect
57-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
58-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
59-
github.com/Masterminds/squirrel v1.5.4 // indirect
60-
github.com/Masterminds/vcs v1.13.3 // indirect
6155
github.com/Microsoft/go-winio v0.6.2 // indirect
6256
github.com/Microsoft/hcsshim v0.12.3 // indirect
6357
github.com/NYTimes/gziphandler v1.1.1 // indirect
@@ -67,7 +61,6 @@ require (
6761
github.com/beorn7/perks v1.0.1 // indirect
6862
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6963
github.com/cespare/xxhash/v2 v2.3.0 // indirect
70-
github.com/chai2010/gettext-go v1.0.2 // indirect
7164
github.com/containerd/cgroups/v3 v3.0.3 // indirect
7265
github.com/containerd/containerd v1.7.19 // indirect
7366
github.com/containerd/containerd/api v1.7.19 // indirect
@@ -84,31 +77,24 @@ require (
8477
github.com/containers/storage v1.54.0 // indirect
8578
github.com/coreos/go-semver v0.3.1 // indirect
8679
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
87-
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
88-
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
8980
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9081
github.com/distribution/reference v0.6.0 // indirect
9182
github.com/docker/cli v27.0.3+incompatible // indirect
9283
github.com/docker/distribution v2.8.3+incompatible // indirect
9384
github.com/docker/docker v26.1.5+incompatible // indirect
9485
github.com/docker/docker-credential-helpers v0.8.1 // indirect
9586
github.com/docker/go-connections v0.5.0 // indirect
96-
github.com/docker/go-metrics v0.0.1 // indirect
9787
github.com/docker/go-units v0.5.0 // indirect
9888
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
9989
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
10090
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
101-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
10291
github.com/fatih/color v1.17.0 // indirect
10392
github.com/felixge/httpsnoop v1.0.4 // indirect
10493
github.com/fsnotify/fsnotify v1.7.0 // indirect
105-
github.com/fvbommel/sortorder v1.1.0 // indirect
10694
github.com/go-air/gini v1.0.4 // indirect
107-
github.com/go-errors/errors v1.4.2 // indirect
10895
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
10996
github.com/go-git/go-billy/v5 v5.5.0 // indirect
11097
github.com/go-git/go-git/v5 v5.11.0 // indirect
111-
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
11298
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
11399
github.com/go-logr/stdr v1.2.2 // indirect
114100
github.com/go-logr/zapr v1.3.0 // indirect
@@ -117,59 +103,43 @@ require (
117103
github.com/go-openapi/swag v0.23.0 // indirect
118104
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
119105
github.com/gobuffalo/flect v1.0.2 // indirect
120-
github.com/gobwas/glob v0.2.3 // indirect
121106
github.com/goccy/go-yaml v1.11.0 // indirect
122-
github.com/gofrs/flock v0.8.1 // indirect
123107
github.com/gogo/protobuf v1.3.2 // indirect
124108
github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
125109
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
126110
github.com/golang/protobuf v1.5.4 // indirect
127-
github.com/google/btree v1.0.1 // indirect
128111
github.com/google/cel-go v0.17.8 // indirect
129112
github.com/google/gnostic-models v0.6.8 // indirect
130113
github.com/google/go-cmp v0.6.0 // indirect
131114
github.com/google/gofuzz v1.2.0 // indirect
132115
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
133-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
134116
github.com/google/uuid v1.6.0 // indirect
135117
github.com/gorilla/mux v1.8.1 // indirect
136118
github.com/gorilla/websocket v1.5.0 // indirect
137-
github.com/gosuri/uitable v0.0.4 // indirect
138-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
139119
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
140120
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
141121
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
142122
github.com/h2non/filetype v1.1.3 // indirect
143123
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
144-
github.com/hashicorp/errwrap v1.1.0 // indirect
145-
github.com/hashicorp/go-multierror v1.1.1 // indirect
146-
github.com/huandu/xstrings v1.4.0 // indirect
147124
github.com/imdario/mergo v0.3.16 // indirect
148125
github.com/inconshreveable/mousetrap v1.1.0 // indirect
149126
github.com/itchyny/gojq v0.12.16 // indirect
150127
github.com/itchyny/timefmt-go v0.1.6 // indirect
151128
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
152-
github.com/jmoiron/sqlx v1.3.5 // indirect
153129
github.com/joelanford/ignore v0.1.0 // indirect
154130
github.com/josharian/intern v1.0.0 // indirect
155131
github.com/json-iterator/go v1.1.12 // indirect
156132
github.com/kisielk/errcheck v1.7.0 // indirect
157133
github.com/klauspost/compress v1.17.8 // indirect
158134
github.com/kylelemons/godebug v1.1.0 // indirect
159-
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
160-
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
161-
github.com/lib/pq v1.10.9 // indirect
162135
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
163136
github.com/mailru/easyjson v0.7.7 // indirect
164137
github.com/mattn/go-colorable v0.1.13 // indirect
165138
github.com/mattn/go-isatty v0.0.20 // indirect
166-
github.com/mattn/go-runewidth v0.0.15 // indirect
167139
github.com/mattn/go-sqlite3 v1.14.22 // indirect
168-
github.com/mitchellh/copystructure v1.2.0 // indirect
169140
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
170141
github.com/mitchellh/hashstructure v1.1.0 // indirect
171142
github.com/mitchellh/mapstructure v1.5.0 // indirect
172-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
173143
github.com/moby/locker v1.0.1 // indirect
174144
github.com/moby/spdystream v0.2.0 // indirect
175145
github.com/moby/sys/mountinfo v0.7.1 // indirect
@@ -178,7 +148,6 @@ require (
178148
github.com/moby/term v0.5.0 // indirect
179149
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
180150
github.com/modern-go/reflect2 v1.0.2 // indirect
181-
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
182151
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
183152
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
184153
github.com/onsi/gomega v1.34.1 // indirect
@@ -187,27 +156,19 @@ require (
187156
github.com/opencontainers/runtime-spec v1.2.0 // indirect
188157
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
189158
github.com/otiai10/copy v1.14.0 // indirect
190-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
159+
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
191160
github.com/pkg/errors v0.9.1 // indirect
192161
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
193162
github.com/prometheus/client_golang v1.19.0 // indirect
194163
github.com/prometheus/client_model v0.6.1 // indirect
195164
github.com/prometheus/common v0.51.1 // indirect
196165
github.com/prometheus/procfs v0.12.0 // indirect
197-
github.com/rivo/uniseg v0.4.7 // indirect
198-
github.com/rubenv/sql-migrate v1.5.2 // indirect
199166
github.com/russross/blackfriday/v2 v2.1.0 // indirect
200-
github.com/shopspring/decimal v1.3.1 // indirect
201-
github.com/spf13/cast v1.5.0 // indirect
202167
github.com/spf13/pflag v1.0.5 // indirect
203168
github.com/spiffe/go-spiffe/v2 v2.2.0 // indirect
204169
github.com/stoewer/go-strcase v1.3.0 // indirect
205170
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
206171
github.com/tidwall/btree v1.7.0 // indirect
207-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
208-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
209-
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
210-
github.com/xlab/treeprint v1.2.0 // indirect
211172
github.com/zeebo/errs v1.3.0 // indirect
212173
go.etcd.io/bbolt v1.3.10 // indirect
213174
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
@@ -223,7 +184,6 @@ require (
223184
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
224185
go.opentelemetry.io/otel/trace v1.24.0 // indirect
225186
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
226-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
227187
go.uber.org/multierr v1.11.0 // indirect
228188
go.uber.org/zap v1.26.0 // indirect
229189
golang.org/x/crypto v0.26.0 // indirect
@@ -259,11 +219,8 @@ require (
259219
k8s.io/kms v0.30.3 // indirect
260220
k8s.io/kube-aggregator v0.30.3 // indirect
261221
k8s.io/kubectl v0.30.0 // indirect
262-
oras.land/oras-go v1.2.5 // indirect
263222
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
264223
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
265-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
266-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
267224
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
268225
sigs.k8s.io/yaml v1.4.0 // indirect
269226
)

0 commit comments

Comments
 (0)