Skip to content

Commit 6cc2d38

Browse files
authored
chore: reset RESTMapper with MaybeResetRESTMapper (#2844)
- Use new method from apimachinery 0.23.0 - Remove local cli-utils pkg modification
1 parent 3140574 commit 6cc2d38

File tree

2 files changed

+2
-37
lines changed

2 files changed

+2
-37
lines changed

pkg/live/inventoryrg.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"time"
2323

2424
"github.com/GoogleContainerTools/kpt/pkg/status"
25-
"github.com/GoogleContainerTools/kpt/thirdparty/cli-utils/pkg/apply/taskrunner"
2625
apierrors "k8s.io/apimachinery/pkg/api/errors"
2726
"k8s.io/apimachinery/pkg/api/meta"
2827
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -377,14 +376,9 @@ func (rgi *ResourceGroupInstaller) InstallRG(ctx context.Context) error {
377376
return e.Error
378377
case pollevent.ResourceUpdateEvent:
379378
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)
385381
}
386-
m.Reset()
387-
return nil
388382
}
389383
}
390384
}

thirdparty/cli-utils/pkg/apply/taskrunner/task.go

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)