Skip to content

Commit 6ebefa3

Browse files
mkumatagmkumatag
authored
use controller-gen from hack/tools (#505)
1 parent 16b0ce9 commit 6ebefa3

12 files changed

+16
-35
lines changed

‎Makefile

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ CONVERSION_GEN := $(TOOLS_BIN_DIR)/conversion-gen
3737
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
3838
ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
3939
MOCKGEN := $(TOOLS_BIN_DIR)/mockgen
40+
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
4041

4142
STAGING_REGISTRY ?= gcr.io/k8s-staging-capi-ibmcloud
4243
STAGING_BUCKET ?= artifacts.k8s-staging-capi-ibmcloud.appspot.com
@@ -100,7 +101,7 @@ deploy: manifests $(KUSTOMIZE)
100101
$(KUSTOMIZE) build config/default | kubectl apply -f -
101102

102103
# Generate manifests e.g. CRD, RBAC etc.
103-
manifests: controller-gen
104+
manifests: $(CONTROLLER_GEN)
104105
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
105106
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role paths="./..." output:crd:artifacts:config=config/crd/bases
106107

@@ -124,7 +125,7 @@ vet:
124125
go vet ./...
125126

126127
# Generate code
127-
generate: controller-gen
128+
generate: $(CONTROLLER_GEN)
128129
$(MAKE) generate-go
129130
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
130131

@@ -133,22 +134,6 @@ generate-go: $(MOCKGEN)
133134
go generate ./...
134135

135136
images: docker-build
136-
# find or download controller-gen
137-
# download controller-gen if necessary
138-
controller-gen:
139-
ifeq (, $(shell which controller-gen))
140-
@{ \
141-
set -e ;\
142-
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
143-
cd $$CONTROLLER_GEN_TMP_DIR ;\
144-
go mod init tmp ;\
145-
go get sigs.k8s.io/controller-tools/cmd/[email protected] ;\
146-
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
147-
}
148-
CONTROLLER_GEN=$(GOBIN)/controller-gen
149-
else
150-
CONTROLLER_GEN=$(shell which controller-gen)
151-
endif
152137

153138
## --------------------------------------
154139
## Linting

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: ibmpowervsclusters.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachines.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: ibmpowervsmachines.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachinetemplates.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: ibmpowervsmachinetemplates.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcclusters.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: ibmvpcclusters.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcmachines.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: ibmvpcmachines.infrastructure.cluster.x-k8s.io
109
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcmachinetemplates.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.6.1
6+
controller-gen.kubebuilder.io/version: v0.8.0
87
creationTimestamp: null
98
name: ibmvpcmachinetemplates.infrastructure.cluster.x-k8s.io
109
spec:

‎config/rbac/role.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: rbac.authorization.k8s.io/v1
43
kind: ClusterRole

‎config/webhook/manifests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: admissionregistration.k8s.io/v1
43
kind: MutatingWebhookConfiguration
@@ -132,7 +131,6 @@ webhooks:
132131
resources:
133132
- ibmvpcmachinetemplates
134133
sideEffects: None
135-
136134
---
137135
apiVersion: admissionregistration.k8s.io/v1
138136
kind: ValidatingWebhookConfiguration

‎hack/tools/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,7 @@ $(ENVSUBST): $(BIN_DIR) go.mod go.sum
9090
MOCKGEN := $(BIN_DIR)/mockgen
9191
$(MOCKGEN): $(BIN_DIR) go.mod go.sum
9292
go build -tags=tools -o $@ github.com/golang/mock/mockgen
93+
94+
CONTROLLER_GEN := $(BIN_DIR)/controller-gen
95+
$(CONTROLLER_GEN): $(BIN_DIR) go.mod go.sum
96+
go build -tags=tools -o $@ sigs.k8s.io/controller-tools/cmd/controller-gen

0 commit comments

Comments
 (0)