fix ClusterServiceVersion manifest to not use deprecated version

Currently manifest templator created the field customresourcedefinitions.owned[0].version using the deprecated crd version field. Lets move to updated versions field. Signed-off-by: Ram Lavi <[email protected]>
kubevirt · Sep 2, 2020 · 51a5064 · 51a5064
1 parent 0e591c3
commit 51a5064
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...work-addons/VERSION/cluster-network-addons-operator.VERSION.clusterserviceversion.yaml.in b/...work-addons/VERSION/cluster-network-addons-operator.VERSION.clusterserviceversion.yaml.in
@@ -96,7 +96,7 @@ spec:
   customresourcedefinitions:
     owned:
       - name: {{.CNA.CRD.ObjectMeta.Name}}
-        version: {{.CNA.CRD.Spec.Version}}
+        version: {{.CNA.CRDVersion}}
         group: {{.CNA.CRD.Spec.Group}}
         kind: {{.CNA.CRD.Spec.Names.Kind}}
         displayName: Cluster Network Addons

diff --git a/tools/manifest-templator/manifest-templator.go b/tools/manifest-templator/manifest-templator.go
@@ -46,6 +46,7 @@ type operatorData struct {
 	ClusterRules      string
 	CRD               *extv1beta1.CustomResourceDefinition
 	CRDString         string
+	CRDVersion        string
 	CRString          string
 	RelatedImages     components.RelatedImages
 }
@@ -194,6 +195,7 @@ func getCNA(data *templateData) {
 	crd := components.GetCrd()
 	marshallObject(crd, &writer)
 	crdString := writer.String()
+	crdVersion := crd.Spec.Versions[0].Name
 
 	// Get CNA CR
 	writer = strings.Builder{}
@@ -215,6 +217,7 @@ func getCNA(data *templateData) {
 		ClusterRules:      clusterRules,
 		CRD:               crd,
 		CRDString:         crdString,
+		CRDVersion:        crdVersion,
 		CRString:          crString,
 		RelatedImages:     relatedImages,
 	}