@@ -11,9 +11,6 @@ OPERATOR_IMAGE ?= storageos/portal-manager:test
1111# Image URL for manifest image.
1212MANIFESTS_IMAGE ?= storageos/portal-manager-manifests:test
1313
14- # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
15- CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
16-
1714# Generate kuttl e2e tests for the following storageos/kind-node versions
1815# TEST_KIND_NODES is not intended to be updated manually.
1916# Please run 'LATEST_KIND_NODE=<latest-kind-node> make update-kind-nodes'.
@@ -54,7 +51,7 @@ help: ## Display this help.
5451# #@ Development
5552
5653manifests : controller-gen # # Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
57- $(CONTROLLER_GEN ) $( CRD_OPTIONS ) rbac:roleName=storageos-portal-manager paths=" ./..." output:crd:artifacts:config=config/crd/bases output:rbac:artifacts:config=config/rbac/bases
54+ $(CONTROLLER_GEN ) crd paths=./api/... rbac:roleName=storageos-portal-manager paths=" ./..." output:crd:artifacts:config=config/crd/bases output:rbac:artifacts:config=config/rbac/bases
5855
5956generate : controller-gen # # Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
6057 $(CONTROLLER_GEN ) object:headerFile=" hack/boilerplate.go.txt" paths=" ./..."
@@ -126,11 +123,11 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
126123
127124CONTROLLER_GEN = $(shell pwd) /bin/controller-gen
128125controller-gen : # # Download controller-gen locally if necessary.
129- $(call go-get-tool,$(CONTROLLER_GEN ) ,sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.1 )
126+ $(call go-get-tool,$(CONTROLLER_GEN ) ,sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.0 )
130127
131128KUSTOMIZE = $(shell pwd) /bin/kustomize
132129kustomize : # # Download kustomize locally if necessary.
133- $(call go-get-tool,$(KUSTOMIZE ) ,sigs.k8s.io/kustomize/kustomize/v3@v3.8.7 )
130+ $(call go-get-tool,$(KUSTOMIZE ) ,sigs.k8s.io/kustomize/kustomize/v4@v4.5.5 )
134131
135132HUSKY = $(shell pwd) /bin/husky
136133.PHONY : husky
0 commit comments