From a016b06bbdb02d00c036912e12ee24b7c8efb770 Mon Sep 17 00:00:00 2001 From: Dixita Narang Date: Fri, 30 Sep 2022 20:55:24 +0000 Subject: [PATCH] Update test plugin to use v1 kubelet APIs --- test/e2e_node/plugins/gcp-credential-provider/main.go | 10 +++++----- .../plugins/gcp-credential-provider/provider.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/e2e_node/plugins/gcp-credential-provider/main.go b/test/e2e_node/plugins/gcp-credential-provider/main.go index 543057d1e08..2f570e8681d 100644 --- a/test/e2e_node/plugins/gcp-credential-provider/main.go +++ b/test/e2e_node/plugins/gcp-credential-provider/main.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" - credentialproviderv1beta1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1" + credentialproviderv1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" ) const metadataTokenEndpoint = "http://metadata.google.internal./computeMetadata/v1/instance/service-accounts/default/token" @@ -51,7 +51,7 @@ func getCredentials(tokenEndpoint string, r io.Reader, w io.Writer) error { return err } - var authRequest credentialproviderv1beta1.CredentialProviderRequest + var authRequest credentialproviderv1.CredentialProviderRequest err = json.Unmarshal(data, &authRequest) if err != nil { return err @@ -62,12 +62,12 @@ func getCredentials(tokenEndpoint string, r io.Reader, w io.Writer) error { return err } - response := &credentialproviderv1beta1.CredentialProviderResponse{ + response := &credentialproviderv1.CredentialProviderResponse{ TypeMeta: metav1.TypeMeta{ Kind: "CredentialProviderResponse", - APIVersion: "credentialprovider.kubelet.k8s.io/v1beta1", + APIVersion: "credentialprovider.kubelet.k8s.io/v1", }, - CacheKeyType: credentialproviderv1beta1.RegistryPluginCacheKeyType, + CacheKeyType: credentialproviderv1.RegistryPluginCacheKeyType, Auth: auth, } diff --git a/test/e2e_node/plugins/gcp-credential-provider/provider.go b/test/e2e_node/plugins/gcp-credential-provider/provider.go index 59ff39febc2..3bbe9a04312 100644 --- a/test/e2e_node/plugins/gcp-credential-provider/provider.go +++ b/test/e2e_node/plugins/gcp-credential-provider/provider.go @@ -25,7 +25,7 @@ import ( "io/ioutil" "net/http" - credentialproviderv1beta1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1" + credentialproviderv1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1" ) const ( @@ -59,8 +59,8 @@ type provider struct { tokenEndpoint string } -func (p *provider) Provide(image string) (map[string]credentialproviderv1beta1.AuthConfig, error) { - cfg := map[string]credentialproviderv1beta1.AuthConfig{} +func (p *provider) Provide(image string) (map[string]credentialproviderv1.AuthConfig, error) { + cfg := map[string]credentialproviderv1.AuthConfig{} tokenJSONBlob, err := readURL(p.tokenEndpoint, p.client) if err != nil { @@ -72,7 +72,7 @@ func (p *provider) Provide(image string) (map[string]credentialproviderv1beta1.A return cfg, err } - authConfig := credentialproviderv1beta1.AuthConfig{ + authConfig := credentialproviderv1.AuthConfig{ Username: "_token", Password: parsedBlob.AccessToken, }