File tree Expand file tree Collapse file tree 2 files changed +2
-37
lines changed
thirdparty/cli-utils/pkg/apply/taskrunner Expand file tree Collapse file tree 2 files changed +2
-37
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,6 @@ import (
22
22
"time"
23
23
24
24
"github.com/GoogleContainerTools/kpt/pkg/status"
25
- "github.com/GoogleContainerTools/kpt/thirdparty/cli-utils/pkg/apply/taskrunner"
26
25
apierrors "k8s.io/apimachinery/pkg/api/errors"
27
26
"k8s.io/apimachinery/pkg/api/meta"
28
27
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -377,14 +376,9 @@ func (rgi *ResourceGroupInstaller) InstallRG(ctx context.Context) error {
377
376
return e .Error
378
377
case pollevent .ResourceUpdateEvent :
379
378
if e .Resource .Status == kstatus .CurrentStatus {
380
- // TODO: Replace this with a call to meta.MaybeResetRESTMapper
381
- // once we update the k8s libraries.
382
- m , err := taskrunner .ExtractDeferredDiscoveryRESTMapper (mapper )
383
- if err != nil {
384
- return err
379
+ if ! meta .MaybeResetRESTMapper (mapper ) {
380
+ return fmt .Errorf ("failed to reset RESTMapper: %T" , mapper )
385
381
}
386
- m .Reset ()
387
- return nil
388
382
}
389
383
}
390
384
}
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments