Don't assume we are targetting 'v1'

Signed-off-by: James Munnelly <jmunnelly@apple.com>
This commit is contained in:
James Munnelly
2022-01-06 15:07:27 +00:00
parent c4d97e1f53
commit 22b2b3687a
+3 -3
View File
@@ -151,7 +151,7 @@ func (m *Migrator) migrateResourcesForCRD(ctx context.Context, crd *apiext.Custo
list := &unstructured.UnstructuredList{}
list.SetGroupVersionKind(schema.GroupVersionKind{
Group: crd.Spec.Group,
Version: "v1",
Version: storageVersionForCRD(crd),
Kind: crd.Spec.Names.ListKind,
})
if err := m.Client.List(ctx, list); err != nil {
@@ -199,8 +199,8 @@ func (m *Migrator) patchCRDStoredVersions(ctx context.Context, crds []*apiext.Cu
return newUnexpectedChangeError(crd)
}
// Set the `status.storedVersions` field to 'v1'
freshCRD.Status.StoredVersions = []string{"v1"}
// Set the `status.storedVersions` field to the target storage version
freshCRD.Status.StoredVersions = []string{storageVersionForCRD(crd)}
if err := m.Client.Status().Update(ctx, freshCRD); err != nil {
return err