Skip to content

Commit 978777a

Browse files
acornett21acornett21
authored
removing hybrid helm plugin (#381)
Signed-off-by: Adam D. Cornett <[email protected]>
1 parent 5fd06e8 commit 978777a

File tree

91 files changed

+45
-7217
lines changed

Some content is hidden

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

91 files changed

+45
-7217
lines changed

‎.goreleaser.yml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ builds:
2323
ldflags:
2424
- -s
2525
- -w
26-
- -X {{ .Env.VERSION_PKG }}.ScaffoldVersion={{ .Env.SCAFFOLD_VERSION }}
2726
- -X {{ .Env.VERSION_PKG }}.GitVersion={{ .Env.GIT_VERSION }}
2827
- -X {{ .Env.VERSION_PKG }}.GitCommit={{ .Env.GIT_COMMIT }}
2928
targets:

‎Makefile

+1-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
# GO_BUILD_ARGS should be set when running 'go build' or 'go install'.
44
VERSION_PKG = "$(shell go list -m)/internal/version"
5-
export SCAFFOLD_VERSION = $(shell git describe --tags --abbrev=0)
65
export GIT_VERSION = $(shell git describe --dirty --tags --always)
76
export GIT_COMMIT = $(shell git rev-parse HEAD)
87
BUILD_DIR = $(PWD)/bin
@@ -12,7 +11,6 @@ GO_BUILD_ARGS = \
1211
-ldflags " \
1312
-s \
1413
-w \
15-
-X '$(VERSION_PKG).ScaffoldVersion=$(SCAFFOLD_VERSION)' \
1614
-X '$(VERSION_PKG).GitVersion=$(GIT_VERSION)' \
1715
-X '$(VERSION_PKG).GitCommit=$(GIT_COMMIT)' \
1816
" \
@@ -29,12 +27,6 @@ include .bingo/Variables.mk
2927

3028
##@ Development
3129

32-
.PHONY: generate
33-
generate: build # Generate CLI docs and samples
34-
rm -rf testdata/
35-
go run ./hack/generate/samples/generate_testdata.go
36-
go generate ./...
37-
3830
.PHONY: all
3931
all: test lint build
4032

@@ -51,7 +43,7 @@ test: build $(SETUP_ENVTEST)
5143
eval $$($(SETUP_ENVTEST) use -p env $(CLIENT_GO_VERSION)) && go test -race -covermode atomic -coverprofile cover.out $(TESTPKG)
5244

5345
.PHONY: test-sanity
54-
test-sanity: generate fix lint ## Test repo formatting, linting, etc.
46+
test-sanity: fix lint ## Test repo formatting, linting, etc.
5547
go vet ./...
5648
git diff --exit-code # diff again to ensure other checks don't change repo
5749

‎go.mod

+1-16
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,14 @@ module github.com/operator-framework/helm-operator-plugins
33
go 1.22.0
44

55
require (
6-
github.com/blang/semver/v4 v4.0.0
76
github.com/go-logr/logr v1.4.2
87
github.com/go-task/slim-sprig/v3 v3.0.0
9-
github.com/iancoleman/strcase v0.3.0
10-
github.com/kr/text v0.2.0
118
github.com/onsi/ginkgo/v2 v2.20.0
129
github.com/onsi/gomega v1.34.1
1310
github.com/operator-framework/operator-lib v0.14.0
1411
github.com/pkg/errors v0.9.1
1512
github.com/prometheus/client_golang v1.20.2
1613
github.com/sergi/go-diff v1.3.1
17-
github.com/sirupsen/logrus v1.9.3
18-
github.com/spf13/afero v1.11.0
1914
github.com/spf13/cobra v1.8.1
2015
github.com/spf13/pflag v1.0.5
2116
github.com/stretchr/testify v1.9.0
@@ -28,7 +23,6 @@ require (
2823
k8s.io/client-go v0.30.3
2924
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3025
sigs.k8s.io/controller-runtime v0.18.4
31-
sigs.k8s.io/kubebuilder/v3 v3.14.2
3226
sigs.k8s.io/yaml v1.4.0
3327
)
3428

@@ -42,10 +36,8 @@ require (
4236
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
4337
github.com/Masterminds/squirrel v1.5.4 // indirect
4438
github.com/Microsoft/hcsshim v0.11.4 // indirect
45-
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
4639
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4740
github.com/beorn7/perks v1.0.1 // indirect
48-
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
4941
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
5042
github.com/bugsnag/panicwrap v1.2.0 // indirect
5143
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -54,14 +46,12 @@ require (
5446
github.com/containerd/log v0.1.0 // indirect
5547
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
5648
github.com/davecgh/go-spew v1.1.1 // indirect
57-
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 // indirect
5849
github.com/distribution/reference v0.5.0 // indirect
5950
github.com/docker/cli v27.1.1+incompatible // indirect
6051
github.com/docker/distribution v2.8.3+incompatible // indirect
6152
github.com/docker/docker v27.1.1+incompatible // indirect
6253
github.com/docker/docker-credential-helpers v0.7.0 // indirect
6354
github.com/docker/go-connections v0.5.0 // indirect
64-
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
6555
github.com/docker/go-metrics v0.0.1 // indirect
6656
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
6757
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
@@ -78,28 +68,24 @@ require (
7868
github.com/go-openapi/jsonpointer v0.20.2 // indirect
7969
github.com/go-openapi/jsonreference v0.20.4 // indirect
8070
github.com/go-openapi/swag v0.22.9 // indirect
81-
github.com/gobuffalo/flect v1.0.2 // indirect
8271
github.com/gobwas/glob v0.2.3 // indirect
8372
github.com/gofrs/uuid v4.0.0+incompatible // indirect
8473
github.com/gogo/protobuf v1.3.2 // indirect
8574
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8675
github.com/golang/protobuf v1.5.4 // indirect
87-
github.com/gomodule/redigo v1.8.2 // indirect
8876
github.com/google/btree v1.1.2 // indirect
8977
github.com/google/gnostic-models v0.6.8 // indirect
9078
github.com/google/go-cmp v0.6.0 // indirect
9179
github.com/google/gofuzz v1.2.0 // indirect
9280
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
9381
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9482
github.com/google/uuid v1.6.0 // indirect
95-
github.com/gorilla/handlers v1.5.1 // indirect
9683
github.com/gorilla/mux v1.8.0 // indirect
9784
github.com/gorilla/websocket v1.5.0 // indirect
9885
github.com/gosuri/uitable v0.0.4 // indirect
9986
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
10087
github.com/hashicorp/errwrap v1.1.0 // indirect
10188
github.com/hashicorp/go-multierror v1.1.1 // indirect
102-
github.com/hashicorp/golang-lru v0.5.4 // indirect
10389
github.com/huandu/xstrings v1.4.0 // indirect
10490
github.com/imdario/mergo v0.3.16 // indirect
10591
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -130,7 +116,6 @@ require (
130116
github.com/opencontainers/go-digest v1.0.0 // indirect
131117
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
132118
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
133-
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
134119
github.com/pmezard/go-difflib v1.0.0 // indirect
135120
github.com/prometheus/client_model v0.6.1 // indirect
136121
github.com/prometheus/common v0.55.0 // indirect
@@ -139,6 +124,7 @@ require (
139124
github.com/rubenv/sql-migrate v1.5.2 // indirect
140125
github.com/russross/blackfriday/v2 v2.1.0 // indirect
141126
github.com/shopspring/decimal v1.3.1 // indirect
127+
github.com/sirupsen/logrus v1.9.3 // indirect
142128
github.com/spf13/cast v1.5.0 // indirect
143129
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
144130
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -156,7 +142,6 @@ require (
156142
go.uber.org/zap v1.26.0 // indirect
157143
golang.org/x/crypto v0.26.0 // indirect
158144
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
159-
golang.org/x/mod v0.20.0 // indirect
160145
golang.org/x/net v0.28.0 // indirect
161146
golang.org/x/oauth2 v0.21.0 // indirect
162147
golang.org/x/sync v0.8.0 // indirect

‎go.sum

-19
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
3535
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
3636
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
3737
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
38-
github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
39-
github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
40-
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
41-
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
4238
github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70=
4339
github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
4440
github.com/bugsnag/bugsnag-go v1.5.3 h1:yeRUT3mUE13jL1tGwvoQsKdVbAsQx9AJ+fqahKveP04=
@@ -63,7 +59,6 @@ github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ
6359
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
6460
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
6561
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
66-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
6762
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
6863
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
6964
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
@@ -103,7 +98,6 @@ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2
10398
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
10499
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
105100
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
106-
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
107101
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
108102
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
109103
github.com/foxcpp/go-mockdns v1.0.0 h1:7jBqxd3WDWwi/6WhDvacvH1XsN3rOLXyHM1uhvIx6FI=
@@ -137,8 +131,6 @@ github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
137131
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
138132
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
139133
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
140-
github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA=
141-
github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
142134
github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU=
143135
github.com/gobuffalo/logger v1.0.6/go.mod h1:J31TBEHR1QLV2683OXTAItYIg8pv2JMHnF/quuAbMjs=
144136
github.com/gobuffalo/packd v1.0.1 h1:U2wXfRr4E9DH8IdsDLlRFwTZTK7hLfq9qT/QHXGVe/0=
@@ -213,8 +205,6 @@ github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG
213205
github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
214206
github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
215207
github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
216-
github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=
217-
github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
218208
github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
219209
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
220210
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
@@ -368,8 +358,6 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
368358
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
369359
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
370360
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
371-
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
372-
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
373361
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
374362
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
375363
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
@@ -379,8 +367,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
379367
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
380368
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
381369
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
382-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
383-
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
384370
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
385371
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
386372
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -389,9 +375,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
389375
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
390376
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
391377
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
392-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
393-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
394-
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
395378
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
396379
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
397380
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -599,8 +582,6 @@ sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHv
599582
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
600583
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
601584
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
602-
sigs.k8s.io/kubebuilder/v3 v3.14.2 h1:LMZW8Y5eItnP4kh9tpp4Gs2Gd5V3DgLgzbNnXfMAShY=
603-
sigs.k8s.io/kubebuilder/v3 v3.14.2/go.mod h1:gEZM8SUkewOQnpRDiewh4gmbQ1FMkT/CDlMddOg053M=
604585
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0=
605586
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3/go.mod h1:9n16EZKMhXBNSiUC5kSdFQJkdH3zbxS/JoO619G1VAY=
606587
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 h1:W6cLQc5pnqM7vh3b7HvGNfXrJ/xL6BDMS0v1V/HHg5U=

‎hack/generate/samples/generate_testdata.go

-55
This file was deleted.

‎hack/generate/samples/internal/hybrid/generate.go

-21
This file was deleted.

0 commit comments

Comments
 (0)