Merge pull request #80 from mengqiy/kustomize

k8s-ci-robot · web-flow · commit bfd3eefb7f22 · 2018-09-11T13:18:50.000-07:00
fix CRD gen to not fail CRD validation
diff --git a/pkg/crd/generator/testData/config/crds/fun_v1alpha1_toy.yaml b/pkg/crd/generator/testData/config/crds/fun_v1alpha1_toy.yaml
@@ -89,5 +89,5 @@ status:
   acceptedNames:
     kind: ""
     plural: ""
-  conditions: null
-  storedVersions: null
+  conditions: []
+  storedVersions: []
diff --git a/pkg/internal/codegen/parse/crd.go b/pkg/internal/codegen/parse/crd.go
@@ -93,6 +93,9 @@ func (b *APIs) parseCRDs() {
 						resource.CRD.Spec.Subresources.Status = &v1beta1.CustomResourceSubresourceStatus{}
 					}
 
+					resource.CRD.Status.Conditions = []v1beta1.CustomResourceDefinitionCondition{}
+					resource.CRD.Status.StoredVersions = []string{}
+
 					if hasScaleSubresource(resource.Type) {
 						if resource.CRD.Spec.Subresources == nil {
 							resource.CRD.Spec.Subresources = &v1beta1.CustomResourceSubresources{}
diff --git a/test/config/crds/creatures_v2alpha1_kraken.yaml b/test/config/crds/creatures_v2alpha1_kraken.yaml
@@ -29,5 +29,5 @@ status:
   acceptedNames:
     kind: ""
     plural: ""
-  conditions: null
-  storedVersions: null
+  conditions: []
+  storedVersions: []
diff --git a/test/config/crds/crew_v1_firstmate.yaml b/test/config/crds/crew_v1_firstmate.yaml
@@ -29,5 +29,5 @@ status:
   acceptedNames:
     kind: ""
     plural: ""
-  conditions: null
-  storedVersions: null
+  conditions: []
+  storedVersions: []
diff --git a/test/config/crds/policy_v1beta1_healthcheckpolicy.yaml b/test/config/crds/policy_v1beta1_healthcheckpolicy.yaml
@@ -29,5 +29,5 @@ status:
   acceptedNames:
     kind: ""
     plural: ""
-  conditions: null
-  storedVersions: null
+  conditions: []
+  storedVersions: []
diff --git a/test/config/crds/ship_v1beta1_frigate.yaml b/test/config/crds/ship_v1beta1_frigate.yaml
@@ -29,5 +29,5 @@ status:
   acceptedNames:
     kind: ""
     plural: ""
-  conditions: null
-  storedVersions: null
+  conditions: []
+  storedVersions: []

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,9 @@ func (b *APIs) parseCRDs() {`
`93`	`93`	`resource.CRD.Spec.Subresources.Status = &v1beta1.CustomResourceSubresourceStatus{}`
`94`	`94`	`}`
`95`	`95`
	`96`	`+ resource.CRD.Status.Conditions = []v1beta1.CustomResourceDefinitionCondition{}`
	`97`	`+ resource.CRD.Status.StoredVersions = []string{}`
	`98`	`+`
`96`	`99`	`if hasScaleSubresource(resource.Type) {`
`97`	`100`	`if resource.CRD.Spec.Subresources == nil {`
`98`	`101`	`resource.CRD.Spec.Subresources = &v1beta1.CustomResourceSubresources{}`