pkg/scaffold/crd*.go: support crd.Versions (#1056)

Author: estroz

pkg/scaffold/crd.go

@@ -139,6 +139,7 @@ func (s *CRD) CustomRender() ([]byte, error) {
 		delete(dstCRD.Labels, "controller-tools.k8s.io")
 	}
 	addCRDSubresource(dstCRD)
+	addCRDVersions(dstCRD)
 	return getCRDBytes(dstCRD)
 }
 
@@ -181,6 +182,39 @@ func addCRDSubresource(crd *apiextv1beta1.CustomResourceDefinition) {
 	}
 }
 
+func addCRDVersions(crd *apiextv1beta1.CustomResourceDefinition) {
+	// crd.Version is deprecated, use crd.Versions instead.
+	var crdVersions []apiextv1beta1.CustomResourceDefinitionVersion
+	if crd.Spec.Version != "" {
+		var verExists, hasStorageVer bool
+		for _, ver := range crd.Spec.Versions {
+			if crd.Spec.Version == ver.Name {
+				verExists = true
+			}
+			// There must be exactly one version flagged as a storage version.
+			if ver.Storage {
+				hasStorageVer = true
+			}
+		}
+		if !verExists {
+			crdVersions = []apiextv1beta1.CustomResourceDefinitionVersion{
+				{Name: crd.Spec.Version, Served: true, Storage: !hasStorageVer},
+			}
+		}
+	} else {
+		crdVersions = []apiextv1beta1.CustomResourceDefinitionVersion{
+			{Name: "v1alpha1", Served: true, Storage: true},
+		}
+	}
+
+	if len(crd.Spec.Versions) > 0 {
+		// crd.Version should always be the first element in crd.Versions.
+		crd.Spec.Versions = append(crdVersions, crd.Spec.Versions...)
+	} else {
+		crd.Spec.Versions = crdVersions
+	}
+}
+
 func getCRDBytes(crd *apiextv1beta1.CustomResourceDefinition) ([]byte, error) {
 	// Remove the "status" field from yaml data, which causes a
 	// resource creation error.

pkg/scaffold/crd_test.go

@@ -100,6 +100,10 @@ spec:
           - nodes
           type: object
   version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
 `
 
 func TestCRDNonGoProject(t *testing.T) {
@@ -135,4 +139,8 @@ spec:
   subresources:
     status: {}
   version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
 `