Skip to content

Commit 657c895

Browse files
authored
Merge pull request #889 from fluxcd/unvendor-restmapper
Unvendor controller-runtime lazy rest mapper
2 parents 090c3ce + 221613d commit 657c895

File tree

4 files changed

+5
-373
lines changed

4 files changed

+5
-373
lines changed

runtime/client/client.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"k8s.io/apimachinery/pkg/api/meta"
2424
"k8s.io/client-go/rest"
2525
ctrl "sigs.k8s.io/controller-runtime"
26+
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
2627

2728
"github.com/fluxcd/cli-utils/pkg/flowcontrol"
2829
)
@@ -95,7 +96,7 @@ func NewDynamicRESTMapper(restConfig *rest.Config) (meta.RESTMapper, error) {
9596
return nil, err
9697
}
9798

98-
restMapper, err := NewLazyRESTMapper(restConfig, httpClient)
99+
restMapper, err := apiutil.NewDynamicRESTMapper(restConfig, httpClient)
99100
if err != nil {
100101
return nil, err
101102
}

runtime/client/restmapper.go

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

runtime/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
k8s.io/client-go v0.32.2
3434
k8s.io/component-base v0.32.2
3535
k8s.io/klog/v2 v2.130.1
36-
sigs.k8s.io/controller-runtime v0.20.2
36+
sigs.k8s.io/controller-runtime v0.20.4
3737
sigs.k8s.io/yaml v1.4.0
3838
)
3939

0 commit comments

Comments
 (0)