Skip to content

apiext: wait for CRD using v1beta1 for compatibility on upgrades #265

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

Merged
openshift-merge-robot merged 1 commit into from
Oct 24, 2019
Merged

apiext: wait for CRD using v1beta1 for compatibility on upgrades #265

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/resourcebuilder/apiext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ func (b *crdBuilder) Do(ctx context.Context) error {
}

if updated {
return waitForCustomResourceDefinitionCompletion(ctx, b.clientV1, name)
return waitForCustomResourceDefinitionCompletion(ctx, b.clientV1beta1, name)
}
return nil
}

func waitForCustomResourceDefinitionCompletion(ctx context.Context, client apiextclientv1.CustomResourceDefinitionsGetter, crd string) error {
func waitForCustomResourceDefinitionCompletion(ctx context.Context, client apiextclientv1beta1.CustomResourceDefinitionsGetter, crd string) error {
return wait.PollImmediateUntil(defaultObjectPollInterval, func() (bool, error) {
c, err := client.CustomResourceDefinitions().Get(crd, metav1.GetOptions{})
if errors.IsNotFound(err) {
Expand All @@ -89,7 +89,7 @@ func waitForCustomResourceDefinitionCompletion(ctx context.Context, client apiex
}

for _, condition := range c.Status.Conditions {
if condition.Type == apiextv1.Established && condition.Status == apiextv1.ConditionTrue {
if condition.Type == apiextv1beta1.Established && condition.Status == apiextv1beta1.ConditionTrue {
return true, nil
}
}
Expand Down