use dynamic rest mapper

Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
pull/13604/head
Austin Abro 8 months ago
parent 9894d3ae78
commit c2dc44deb9
No known key found for this signature in database
GPG Key ID: 92EB5159E403F9D6

@ -38,6 +38,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
multierror "github.com/hashicorp/go-multierror"
"k8s.io/apimachinery/pkg/api/meta"
@ -107,11 +108,19 @@ func init() {
}
func getStatusWatcher(factory Factory) (watcher.StatusWatcher, error) {
cfg, err := factory.ToRESTConfig()
if err != nil {
return nil, err
}
dynamicClient, err := factory.DynamicClient()
if err != nil {
return nil, err
}
restMapper, err := factory.ToRESTMapper()
httpClient, err := rest.HTTPClientFor(cfg)
if err != nil {
return nil, err
}
restMapper, err := apiutil.NewDynamicRESTMapper(cfg, httpClient)
if err != nil {
return nil, err
}

@ -21,6 +21,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/kubectl/pkg/validation"
)
@ -37,6 +38,9 @@ type Factory interface {
// ToRESTMapper returns a restmapper
ToRESTMapper() (meta.RESTMapper, error)
// ToRESTConfig returns restconfig
ToRESTConfig() (*rest.Config, error)
// ToRawKubeConfigLoader return kubeconfig loader as-is
ToRawKubeConfigLoader() clientcmd.ClientConfig

Loading…
Cancel
Save