config/crds

replicatedhq · Jul 9, 2019 · 277ad11 · 277ad11
1 parent a4824db
commit 277ad11
Show file tree

Hide file tree

Showing 13 changed files with 1,090 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -30,16 +30,16 @@ run: generate fmt vet
 
 # Install CRDs into a cluster
 install: manifests
-	kubectl apply -f config/crd
+	kubectl apply -f config/crds
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 deploy: manifests
-	kubectl apply -f config/crd
+	kubectl apply -f config/crds
 	kustomize build config/default | kubectl apply -f -
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests:
-	controller-gen paths=./pkg/apis/...
+	controller-gen paths=./pkg/apis/... output:dir=./config/crds
 
 .PHONY: fmt
 fmt:

diff --git a/config/crd/troubleshoot.replicated.com_collectorjobs.yaml b/config/crd/troubleshoot.replicated.com_collectorjobs.yaml
@@ -390,18 +390,6 @@ spec:
                 type: string
             type: object
           spec:
-            properties:
-              collector:
-                properties:
-                  name:
-                    type: string
-                  namespace:
-                    type: string
-                required:
-                - name
-                type: object
-            required:
-            - collector
             type: object
           status:
             type: object

diff --git a/config/crds/manifests.yaml b/config/crds/manifests.yaml
diff --git a/...bleshoot.replicated.com_analyzerjobs.yaml → ...bleshoot.replicated.com_analyzerjobs.yaml b/...bleshoot.replicated.com_analyzerjobs.yaml → ...bleshoot.replicated.com_analyzerjobs.yaml
diff --git a/...roubleshoot.replicated.com_analyzers.yaml → ...roubleshoot.replicated.com_analyzers.yaml b/...roubleshoot.replicated.com_analyzers.yaml → ...roubleshoot.replicated.com_analyzers.yaml
diff --git a/config/crds/troubleshoot.replicated.com_collectorjobs.yaml b/config/crds/troubleshoot.replicated.com_collectorjobs.yaml
diff --git a/...oubleshoot.replicated.com_collectors.yaml → ...oubleshoot.replicated.com_collectors.yaml b/...oubleshoot.replicated.com_collectors.yaml → ...oubleshoot.replicated.com_collectors.yaml
diff --git a/...leshoot.replicated.com_preflightjobs.yaml → ...leshoot.replicated.com_preflightjobs.yaml b/...leshoot.replicated.com_preflightjobs.yaml → ...leshoot.replicated.com_preflightjobs.yaml
diff --git a/...oubleshoot.replicated.com_preflights.yaml → ...oubleshoot.replicated.com_preflights.yaml b/...oubleshoot.replicated.com_preflights.yaml → ...oubleshoot.replicated.com_preflights.yaml