Skip to content

Commit c5230f3

Browse files
author
Per Goncalves da Silva
committed
move helm to bingo
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent d57288a commit c5230f3

File tree

1,246 files changed

+567
-289481
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,246 files changed

+567
-289481
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.14.3
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.14.3"
24+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm.mod -o=$(GOBIN)/helm-v3.14.3 "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.21.0
4+
5+
require helm.sh/helm/v3 v3.14.3 // cmd/helm

.bingo/helm.sum

Lines changed: 488 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.14.3"
12+

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ SHELL := /bin/bash
22
ROOT_DIR:= $(patsubst %/,%,$(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
33
CONTAINER_ENGINE := docker
44

5+
# import tools
6+
include .bingo/Variables.mk
7+
58
OPM_VERSION := $(or $(SOURCE_GIT_TAG),$(shell git describe --always --tags HEAD))
69
BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
710
# ART builds are performed in dist-git, with content (but not commits) copied
@@ -139,7 +142,7 @@ vendor:
139142
go mod verify
140143

141144
.PHONY: manifests
142-
manifests: ## Generate manifests
145+
manifests: $(HELM) ## Generate manifests
143146
OLM_VERSION=$(OLM_VERSION) ./scripts/generate_crds_manifests.sh
144147

145148
.PHONY: generate-manifests

go.mod

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ require (
2222
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
2323
google.golang.org/protobuf v1.33.0
2424
gopkg.in/yaml.v2 v2.4.0
25-
helm.sh/helm/v3 v3.14.3
2625
k8s.io/api v0.29.3
2726
k8s.io/apimachinery v0.29.3
2827
k8s.io/client-go v0.29.3
@@ -38,11 +37,6 @@ require (
3837
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
3938
github.com/BurntSushi/toml v1.3.2 // indirect
4039
github.com/MakeNowJust/heredoc v1.0.0 // indirect
41-
github.com/Masterminds/goutils v1.1.1 // indirect
42-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
43-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
44-
github.com/Masterminds/squirrel v1.5.4 // indirect
45-
github.com/Masterminds/vcs v1.13.3 // indirect
4640
github.com/Microsoft/go-winio v0.6.1 // indirect
4741
github.com/Microsoft/hcsshim v0.12.0-rc.1 // indirect
4842
github.com/NYTimes/gziphandler v1.1.1 // indirect
@@ -51,7 +45,6 @@ require (
5145
github.com/beorn7/perks v1.0.1 // indirect
5246
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
5347
github.com/cespare/xxhash/v2 v2.2.0 // indirect
54-
github.com/chai2010/gettext-go v1.0.2 // indirect
5548
github.com/containerd/cgroups/v3 v3.0.2 // indirect
5649
github.com/containerd/containerd v1.7.12 // indirect
5750
github.com/containerd/continuity v0.4.2 // indirect
@@ -65,8 +58,6 @@ require (
6558
github.com/containers/storage v1.51.0 // indirect
6659
github.com/coreos/go-semver v0.3.1 // indirect
6760
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
68-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
69-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
7061
github.com/davecgh/go-spew v1.1.1 // indirect
7162
github.com/distribution/distribution v2.7.1+incompatible // indirect
7263
github.com/distribution/reference v0.6.0 // indirect
@@ -75,22 +66,17 @@ require (
7566
github.com/docker/docker v25.0.5+incompatible // indirect
7667
github.com/docker/docker-credential-helpers v0.8.0 // indirect
7768
github.com/docker/go-connections v0.5.0 // indirect
78-
github.com/docker/go-metrics v0.0.1 // indirect
7969
github.com/docker/go-units v0.5.0 // indirect
8070
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
8171
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
8272
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
83-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
8473
github.com/fatih/color v1.15.0 // indirect
8574
github.com/felixge/httpsnoop v1.0.4 // indirect
8675
github.com/fsnotify/fsnotify v1.7.0 // indirect
87-
github.com/fvbommel/sortorder v1.1.0 // indirect
8876
github.com/go-air/gini v1.0.4 // indirect
89-
github.com/go-errors/errors v1.4.2 // indirect
9077
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
9178
github.com/go-git/go-billy/v5 v5.5.0 // indirect
9279
github.com/go-git/go-git/v5 v5.11.0 // indirect
93-
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
9480
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
9581
github.com/go-logr/stdr v1.2.2 // indirect
9682
github.com/go-logr/zapr v1.3.0 // indirect
@@ -99,67 +85,52 @@ require (
9985
github.com/go-openapi/swag v0.22.9 // indirect
10086
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
10187
github.com/gobuffalo/flect v0.2.3 // indirect
102-
github.com/gobwas/glob v0.2.3 // indirect
10388
github.com/goccy/go-yaml v1.8.1 // indirect
104-
github.com/gofrs/flock v0.8.1 // indirect
10589
github.com/gogo/protobuf v1.3.2 // indirect
10690
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
10791
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
10892
github.com/golang/protobuf v1.5.4 // indirect
109-
github.com/google/btree v1.0.1 // indirect
11093
github.com/google/cel-go v0.17.7 // indirect
11194
github.com/google/gnostic-models v0.6.8 // indirect
11295
github.com/google/go-cmp v0.6.0 // indirect
11396
github.com/google/gofuzz v1.2.0 // indirect
11497
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
115-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
11698
github.com/google/uuid v1.6.0 // indirect
11799
github.com/gorilla/mux v1.8.1 // indirect
118100
github.com/gorilla/websocket v1.5.0 // indirect
119-
github.com/gosuri/uitable v0.0.4 // indirect
120-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
121101
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
122102
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
123103
github.com/h2non/filetype v1.1.3 // indirect
124104
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
125105
github.com/hashicorp/errwrap v1.1.0 // indirect
126106
github.com/hashicorp/go-multierror v1.1.1 // indirect
127-
github.com/huandu/xstrings v1.4.0 // indirect
128107
github.com/imdario/mergo v0.3.16 // indirect
129108
github.com/inconshreveable/mousetrap v1.1.0 // indirect
130109
github.com/itchyny/gojq v0.12.15 // indirect
131110
github.com/itchyny/timefmt-go v0.1.5 // indirect
132111
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
133-
github.com/jmoiron/sqlx v1.3.5 // indirect
134112
github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d // indirect
135113
github.com/josharian/intern v1.0.0 // indirect
136114
github.com/json-iterator/go v1.1.12 // indirect
137115
github.com/kisielk/errcheck v1.5.0 // indirect
138116
github.com/klauspost/compress v1.17.4 // indirect
139117
github.com/klauspost/pgzip v1.2.6 // indirect
140118
github.com/kylelemons/godebug v1.1.0 // indirect
141-
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
142-
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
143-
github.com/lib/pq v1.10.9 // indirect
144119
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
145120
github.com/mailru/easyjson v0.7.7 // indirect
146121
github.com/mattn/go-colorable v0.1.13 // indirect
147122
github.com/mattn/go-isatty v0.0.20 // indirect
148-
github.com/mattn/go-runewidth v0.0.15 // indirect
149123
github.com/mattn/go-sqlite3 v1.14.22 // indirect
150-
github.com/mitchellh/copystructure v1.2.0 // indirect
151124
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
152125
github.com/mitchellh/hashstructure v1.1.0 // indirect
153126
github.com/mitchellh/mapstructure v1.5.0 // indirect
154-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
155127
github.com/moby/locker v1.0.1 // indirect
156128
github.com/moby/spdystream v0.2.0 // indirect
157129
github.com/moby/sys/mountinfo v0.7.1 // indirect
158130
github.com/moby/sys/sequential v0.5.0 // indirect
159131
github.com/moby/term v0.5.0 // indirect
160132
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
161133
github.com/modern-go/reflect2 v1.0.2 // indirect
162-
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
163134
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
164135
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
165136
github.com/onsi/gomega v1.31.1 // indirect
@@ -169,28 +140,20 @@ require (
169140
github.com/opencontainers/runtime-spec v1.1.0 // indirect
170141
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
171142
github.com/otiai10/copy v1.14.0 // indirect
172-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
143+
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
173144
github.com/pkg/errors v0.9.1 // indirect
174145
github.com/pmezard/go-difflib v1.0.0 // indirect
175146
github.com/prometheus/client_golang v1.18.0 // indirect
176147
github.com/prometheus/client_model v0.6.0 // indirect
177148
github.com/prometheus/common v0.47.0 // indirect
178149
github.com/prometheus/procfs v0.12.0 // indirect
179-
github.com/rivo/uniseg v0.4.7 // indirect
180-
github.com/rubenv/sql-migrate v1.5.2 // indirect
181150
github.com/russross/blackfriday/v2 v2.1.0 // indirect
182-
github.com/shopspring/decimal v1.3.1 // indirect
183-
github.com/spf13/cast v1.5.0 // indirect
184151
github.com/spf13/pflag v1.0.5 // indirect
185152
github.com/spiffe/go-spiffe/v2 v2.1.6 // indirect
186153
github.com/stoewer/go-strcase v1.3.0 // indirect
187154
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
188155
github.com/ulikunitz/xz v0.5.11 // indirect
189156
github.com/vbatts/tar-split v0.11.5 // indirect
190-
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
191-
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
192-
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
193-
github.com/xlab/treeprint v1.2.0 // indirect
194157
github.com/zeebo/errs v1.3.0 // indirect
195158
go.etcd.io/bbolt v1.3.9 // indirect
196159
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
@@ -206,7 +169,6 @@ require (
206169
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
207170
go.opentelemetry.io/otel/trace v1.23.1 // indirect
208171
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
209-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
210172
go.uber.org/multierr v1.11.0 // indirect
211173
go.uber.org/zap v1.26.0 // indirect
212174
golang.org/x/crypto v0.21.0 // indirect
@@ -243,11 +205,8 @@ require (
243205
k8s.io/kms v0.29.3 // indirect
244206
k8s.io/kube-aggregator v0.29.3 // indirect
245207
k8s.io/kubectl v0.29.3 // indirect
246-
oras.land/oras-go v1.2.5 // indirect
247208
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
248209
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
249-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
250-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
251210
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
252211
sigs.k8s.io/yaml v1.4.0 // indirect
253212
)

0 commit comments

Comments
 (0)