From 6481d73b09b5dc9e552d0bafd20bd1228219f177 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Tue, 15 Jun 2021 15:43:58 +0200 Subject: [PATCH] Handle the Broker CRD in Makefile Makefile doesn't know about deploy/crds/submariner.io_brokers.yaml; this hasn't caused problems so far because it is generated along with the Submariner CRD, but it can cause confusion. Declaring it explicitly means we can blindly run make deploy/crds/submariner.io_brokers.yaml without knowing how to generate it. Signed-off-by: Stephen Kitt --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 028ec3397..79cd5a31d 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,7 @@ ci: generate-embeddedyamls golangci-lint markdownlint unit build images generate-embeddedyamls: generate pkg/subctl/operator/common/embeddedyamls/yamls.go -pkg/subctl/operator/common/embeddedyamls/yamls.go: pkg/subctl/operator/common/embeddedyamls/generators/yamls2go.go deploy/crds/submariner.io_servicediscoveries.yaml deploy/crds/submariner.io_submariners.yaml deploy/submariner/crds/submariner.io_clusters.yaml deploy/submariner/crds/submariner.io_endpoints.yaml deploy/submariner/crds/submariner.io_gateways.yaml $(shell find deploy/ -name "*.yaml") $(shell find config/rbac/ -name "*.yaml") vendor/modules.txt +pkg/subctl/operator/common/embeddedyamls/yamls.go: pkg/subctl/operator/common/embeddedyamls/generators/yamls2go.go deploy/crds/submariner.io_servicediscoveries.yaml deploy/crds/submariner.io_brokers.yaml deploy/crds/submariner.io_submariners.yaml deploy/submariner/crds/submariner.io_clusters.yaml deploy/submariner/crds/submariner.io_endpoints.yaml deploy/submariner/crds/submariner.io_gateways.yaml $(shell find deploy/ -name "*.yaml") $(shell find config/rbac/ -name "*.yaml") vendor/modules.txt go generate pkg/subctl/operator/common/embeddedyamls/generate.go # Operator CRDs @@ -145,7 +145,7 @@ $(CONTROLLER_GEN): vendor/modules.txt deploy/crds/submariner.io_servicediscoveries.yaml: $(CONTROLLER_GEN) ./apis/submariner/v1alpha1/servicediscovery_types.go vendor/modules.txt $(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./..." output:crd:artifacts:config=deploy/crds -deploy/crds/submariner.io_submariners.yaml: $(CONTROLLER_GEN) ./apis/submariner/v1alpha1/submariner_types.go vendor/modules.txt +deploy/crds/submariner.io_brokers.yaml deploy/crds/submariner.io_submariners.yaml: $(CONTROLLER_GEN) ./apis/submariner/v1alpha1/submariner_types.go vendor/modules.txt $(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./..." output:crd:artifacts:config=deploy/crds # Submariner CRDs