Skip to content

Commit 49aff1e

Browse files
timflannagantimflannagan
committed
Remove the root tools.go directory; add go-bindata target; update the go-bindata defs.go
Signed-off-by: timflannagan <[email protected]>
1 parent 60ee164 commit 49aff1e

File tree

6 files changed

+16
-29
lines changed

6 files changed

+16
-29
lines changed

‎Makefile

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,27 @@ clean: ## Clean up the build artifacts
5151
generate: controller-gen ## Generate code
5252
$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./...
5353

54-
manifests: yq controller-gen ## Generate manifests e.g. CRD, RBAC etc
55-
@# Create CRDs for new APIs
54+
manifests: yq controller-gen go-bindata ## Generate manifests e.g. CRD, RBAC etc
55+
@echo Create CRDs for new APIs
5656
$(CONTROLLER_GEN) crd:crdVersions=v1 output:crd:dir=./crds paths=./pkg/operators/...
5757

58-
@# Update existing CRDs from type changes
58+
@echo Update existing CRDs from type changes
5959
$(CONTROLLER_GEN) schemapatch:manifests=./crds output:dir=./crds paths=./pkg/operators/...
6060

61-
@# Add missing defaults in embedded core API schemas
61+
@echo Add missing defaults in embedded core API schemas
6262
$(Q)$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.containers.items.properties.ports.items.properties.protocol.default TCP
6363
$(Q)$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.spec.properties.initContainers.items.properties.ports.items.properties.protocol.default TCP
6464

65-
@# Preserve fields for embedded metadata fields
65+
@echo Preserve fields for embedded metadata fields
6666
$(Q)$(YQ) w --inplace ./crds/operators.coreos.com_clusterserviceversions.yaml spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.metadata.x-kubernetes-preserve-unknown-fields true
6767

68-
@# Remove OperatorCondition.spec.overrides[*].lastTransitionTime requirement
68+
@echo Remove OperatorCondition.spec.overrides[*].lastTransitionTime requirement
6969
$(Q)$(YQ) delete --inplace ./crds/operators.coreos.com_operatorconditions.yaml 'spec.versions[*].schema.openAPIV3Schema.properties.spec.properties.overrides.items.required(.==lastTransitionTime)'
7070

71-
@# Remove status subresource from the CRD manifests to ensure server-side apply works
71+
@echo Remove status subresource from the CRD manifests to ensure server-side apply works
7272
$(Q)for f in ./crds/*.yaml ; do $(YQ) d --inplace $$f status; done
7373

74-
@# Update embedded CRD files.
74+
@echo Update embedded CRD files
7575
$(Q)go generate ./crds/...
7676

7777
# Static tests.
@@ -106,8 +106,12 @@ endef
106106

107107
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
108108
controller-gen: ## Download controller-gen locally if necessary.
109-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2)
109+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
110110

111111
YQ = $(shell pwd)/bin/yq
112112
yq:
113113
$(call go-get-tool,$(YQ),github.com/mikefarah/yq/v3)
114+
115+
GO_BINDATA = $(shell pwd)/bin/go-bindata
116+
go-bindata:
117+
$(call go-get-tool,$(GO_BINDATA),github.com/go-bindata/go-bindata/v3/[email protected])

‎crds/defs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package crds
22

33
// Generate embedded files from CRDs to avoid file path changes when this package is imported.
4-
//go:generate go run github.com/go-bindata/go-bindata/v3/go-bindata -pkg crds -o zz_defs.go -ignore=.*\.go -nometadata .
4+
//go:generate go run -mod=mod github.com/go-bindata/go-bindata/v3/go-bindata -pkg crds -o zz_defs.go -ignore=.*\.go -nometadata .
55

66
import (
77
"bytes"

‎crds/zz_defs.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/blang/semver v3.5.1+incompatible
77
github.com/blang/semver/v4 v4.0.0
88
github.com/ghodss/yaml v1.0.0
9-
github.com/go-bindata/go-bindata/v3 v3.1.3
109
github.com/google/cel-go v0.9.0
1110
github.com/google/go-cmp v0.5.6 // indirect
1211
github.com/sirupsen/logrus v1.8.1
@@ -29,6 +28,7 @@ require (
2928
github.com/cespare/xxhash/v2 v2.1.1 // indirect
3029
github.com/davecgh/go-spew v1.1.1 // indirect
3130
github.com/felixge/httpsnoop v1.0.1 // indirect
31+
github.com/go-bindata/go-bindata/v3 v3.1.3 // indirect
3232
github.com/go-logr/logr v1.2.0 // indirect
3333
github.com/go-openapi/jsonpointer v0.19.5 // indirect
3434
github.com/go-openapi/jsonreference v0.19.5 // indirect
@@ -43,7 +43,6 @@ require (
4343
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4444
github.com/josharian/intern v1.0.0 // indirect
4545
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/kisielk/errcheck v1.5.0 // indirect
4746
github.com/mailru/easyjson v0.7.6 // indirect
4847
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
4948
github.com/mitchellh/mapstructure v1.4.1 // indirect
@@ -66,16 +65,12 @@ require (
6665
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
6766
go.opentelemetry.io/otel/trace v0.20.0 // indirect
6867
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
69-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
70-
golang.org/x/mod v0.4.2 // indirect
7168
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
7269
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
7370
golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
7471
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
7572
golang.org/x/text v0.3.7 // indirect
7673
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
77-
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
78-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
7974
google.golang.org/appengine v1.6.7 // indirect
8075
google.golang.org/grpc v1.40.0 // indirect
8176
google.golang.org/protobuf v1.27.1 // indirect

‎go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
310310
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
311311
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
312312
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
313-
github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=
314313
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
315314
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
316315
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -553,7 +552,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu
553552
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
554553
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
555554
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
556-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
557555
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
558556
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
559557
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
@@ -565,7 +563,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
565563
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
566564
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
567565
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
568-
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
569566
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
570567
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
571568
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -784,7 +781,6 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
784781
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
785782
golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
786783
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
787-
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff h1:VX/uD7MK0AHXGiScH3fsieUQUcpmRERPDYtqZdJnA+Q=
788784
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM=
789785
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
790786
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎tools.go

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)