Configure manifest generation to the correct directory (#193)

kudobuilder · Apr 17, 2019 · b253704 · b253704
1 parent 55ae38d
commit b253704
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -63,7 +63,9 @@ deploy-clean:
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests:
-	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go all
+	# controller-gen/main.go all == [rbac, crd]
+	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go rbac --output-dir=config/default/rbac
+	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go crd
 
 # Run go fmt against code
 fmt:

diff --git a/config/crds/kudo_v1alpha1_instance.yaml b/config/crds/kudo_v1alpha1_instance.yaml
@@ -14,10 +14,8 @@ spec:
   validation:
     openAPIV3Schema:
       properties:
-        apiVersion:
-          type: string
-        kind:
-          type: string
+        inline:
+          type: object
         metadata:
           type: object
         spec:
@@ -46,6 +44,8 @@ spec:
             status:
               type: string
           type: object
+      required:
+      - inline
   version: v1alpha1
 status:
   acceptedNames:

diff --git a/config/crds/kudo_v1alpha1_planexecution.yaml b/config/crds/kudo_v1alpha1_planexecution.yaml
@@ -14,10 +14,8 @@ spec:
   validation:
     openAPIV3Schema:
       properties:
-        apiVersion:
-          type: string
-        kind:
-          type: string
+        inline:
+          type: object
         metadata:
           type: object
         spec:
@@ -65,6 +63,8 @@ spec:
             strategy:
               type: string
           type: object
+      required:
+      - inline
   version: v1alpha1
 status:
   acceptedNames: