From 51a506459540a69ddf1a8032b5474cdefae4506e Mon Sep 17 00:00:00 2001 From: Ram Lavi Date: Wed, 2 Sep 2020 12:01:39 +0300 Subject: [PATCH] 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 --- ...twork-addons-operator.VERSION.clusterserviceversion.yaml.in | 2 +- tools/manifest-templator/manifest-templator.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/cluster-network-addons/VERSION/cluster-network-addons-operator.VERSION.clusterserviceversion.yaml.in b/templates/cluster-network-addons/VERSION/cluster-network-addons-operator.VERSION.clusterserviceversion.yaml.in index b2ecb54dc..5f608a025 100644 --- a/templates/cluster-network-addons/VERSION/cluster-network-addons-operator.VERSION.clusterserviceversion.yaml.in +++ b/templates/cluster-network-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 index 88125f72b..ed08df88f 100644 --- 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, }