Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Retry on updating already existing CRD definitions #2540

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Retry on updating already existing CRD definitions #2540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 15 additions & 8 deletions pkg/customresource/customresource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/util/retry"

// importing go check to bypass the testing flags
_ "gopkg.in/check.v1"
Expand Down Expand Up @@ -130,16 +131,22 @@ func createCRD(context Context, resource CustomResource) error {
return errors.Errorf("Failed to create %s CRD. %+v", resource.Name, err)
}

// if CRD already exists, get the resource version and create the CRD with that resource version
c, err := context.APIExtensionClientset.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, crd.Name, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("Failed to get CRD to get resource version: %s\n", err.Error())
}
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
// if CRD already exists, get the resource version and create the CRD with that resource version
c, err := context.APIExtensionClientset.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, crd.Name, metav1.GetOptions{})
if err != nil {
return err
}

crd.ResourceVersion = c.ResourceVersion
_, err = context.APIExtensionClientset.ApiextensionsV1().CustomResourceDefinitions().Update(ctx, crd, metav1.UpdateOptions{})
crd.ResourceVersion = c.ResourceVersion
_, err = context.APIExtensionClientset.ApiextensionsV1().CustomResourceDefinitions().Update(ctx, crd, metav1.UpdateOptions{})
if err != nil {
return err
}
return nil
})
if err != nil {
return fmt.Errorf("Failed to delete already present CRD: %s\n", err.Error())
return fmt.Errorf("Failed to update existing CRD: %s\n", err.Error())
}
}
return nil
Expand Down