Skip to content

Commit d2caa19

Browse files
authored
Merge pull request #6273 from k8s-infra-cherrypick-robot/cherry-pick-6268-to-release-1.0
🐛 make listObjByGVK resilient
2 parents e6c488e + a8824a4 commit d2caa19

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

cmd/clusterctl/client/cluster/proxy.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323

2424
"github.com/pkg/errors"
2525
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
26-
apierrors "k8s.io/apimachinery/pkg/api/errors"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2827
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2928
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -298,11 +297,13 @@ func listObjByGVK(c client.Client, groupVersion, kind string, options []client.L
298297
objList.SetAPIVersion(groupVersion)
299298
objList.SetKind(kind)
300299

301-
if err := c.List(ctx, objList, options...); err != nil {
302-
if !apierrors.IsNotFound(err) {
303-
return nil, errors.Wrapf(err, "failed to list objects for the %q GroupVersionKind", objList.GroupVersionKind())
304-
}
300+
resourceListBackoff := newReadBackoff()
301+
if err := retryWithExponentialBackoff(resourceListBackoff, func() error {
302+
return c.List(ctx, objList, options...)
303+
}); err != nil {
304+
return nil, errors.Wrapf(err, "failed to list objects for the %q GroupVersionKind", objList.GroupVersionKind())
305305
}
306+
306307
return objList, nil
307308
}
308309

0 commit comments

Comments
 (0)