Skip to content

Commit

Permalink
Do not set DomainMapping CRD to v1alpha1 during downgrade (#2591)
Browse files Browse the repository at this point in the history
On release-1.32, the tests currently downgrade from Knative 1.11 to
1.11. This version already stores v1beta1 so there's no point to setting
in to v1alpha1.
  • Loading branch information
mgencur authored Apr 2, 2024
1 parent 8fcfc17 commit df94ea5
Showing 1 changed file with 0 additions and 57 deletions.
57 changes: 0 additions & 57 deletions test/upgrade/installation/serverless.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,22 +134,6 @@ func DowngradeServerless(ctx *test.Context) error {
}
}

dcrd := "domainmappings.serving.knative.dev"

if err := moveCRDsToAlpha(ctx, dcrd); err != nil {
return err
}

// We might have to do an empty patch as in the example bellow for all existing resources
//if _, err := ctx.Clients.Serving.ServingV1alpha1().DomainMappings("...").Patch(context.Background(), "dm_name", types.MergePatchType, []byte("{}"), metav1.PatchOptions{}, ""); err != nil {
// return err
//}
//

if err := setStorageToAlpha(ctx, dcrd); err != nil {
return err
}

if _, err := test.CreateNamespace(ctx, test.OperatorsNamespace); err != nil {
return err
}
Expand Down Expand Up @@ -220,47 +204,6 @@ func setWebookStrategyToNone(ctx *test.Context, name string) error {
})
}

func moveCRDsToAlpha(ctx *test.Context, name string) error {
return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
crd, err := ctx.Clients.APIExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.Background(), name, metav1.GetOptions{})
if err != nil {
return err
}
for i, v := range crd.Spec.Versions {
if v.Name == "v1beta1" {
crd.Spec.Versions[i].Served = false
crd.Spec.Versions[i].Storage = false
}

if v.Name == "v1alpha1" {
crd.Spec.Versions[i].Served = true
crd.Spec.Versions[i].Storage = true
}
}
_, err = ctx.Clients.APIExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Update(context.Background(), crd, metav1.UpdateOptions{})
return err
})
}

func setStorageToAlpha(ctx *test.Context, name string) error {
return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
crd, err := ctx.Clients.APIExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.Background(), name, metav1.GetOptions{})
if err != nil {
return err
}
oldStoredVersions := crd.Status.StoredVersions
newStoredVersions := make([]string, 0, len(oldStoredVersions))
for _, stored := range oldStoredVersions {
if stored != "v1beta1" {
newStoredVersions = append(newStoredVersions, stored)
}
}
crd.Status.StoredVersions = newStoredVersions
_, err = ctx.Clients.APIExtensionClient.ApiextensionsV1().CustomResourceDefinitions().UpdateStatus(context.Background(), crd, metav1.UpdateOptions{})
return err
})
}

func downgradeKafkaContractsWithScript() error {
c := exec.Command("bash", "-s", "-", test.EventingNamespace, "kafka-source-dispatcher-0", "kafka-source-dispatcher-1")

Expand Down

0 comments on commit df94ea5

Please sign in to comment.