github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Update test plugin to use v1 kubelet APIs

Browse Source
This commit is contained in:
Dixita Narang 2022-09-30 20:55:24 +00:00
parent 1ac4fc779b
commit a016b06bbd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e_node/plugins/gcp-credential-provider/main.go
View File

@ -27,7 +27,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2" "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" 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 return err
} }
var authRequest credentialproviderv1beta1.CredentialProviderRequest var authRequest credentialproviderv1.CredentialProviderRequest
err = json.Unmarshal(data, &authRequest) err = json.Unmarshal(data, &authRequest)
if err != nil { if err != nil {
return err return err
@ -62,12 +62,12 @@ func getCredentials(tokenEndpoint string, r io.Reader, w io.Writer) error {
return err return err
} }
response := &credentialproviderv1beta1.CredentialProviderResponse{ response := &credentialproviderv1.CredentialProviderResponse{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
Kind: "CredentialProviderResponse", Kind: "CredentialProviderResponse",
APIVersion: "credentialprovider.kubelet.k8s.io/v1beta1", APIVersion: "credentialprovider.kubelet.k8s.io/v1",
}, },
CacheKeyType: credentialproviderv1beta1.RegistryPluginCacheKeyType, CacheKeyType: credentialproviderv1.RegistryPluginCacheKeyType,
Auth: auth, Auth: auth,
} }

8
test/e2e_node/plugins/gcp-credential-provider/provider.go
View File

@ -25,7 +25,7 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
credentialproviderv1beta1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1" credentialproviderv1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1"
) )
const ( const (
@ -59,8 +59,8 @@ type provider struct {
tokenEndpoint string tokenEndpoint string
} }
func (p *provider) Provide(image string) (map[string]credentialproviderv1beta1.AuthConfig, error) { func (p *provider) Provide(image string) (map[string]credentialproviderv1.AuthConfig, error) {
cfg := map[string]credentialproviderv1beta1.AuthConfig{} cfg := map[string]credentialproviderv1.AuthConfig{}
tokenJSONBlob, err := readURL(p.tokenEndpoint, p.client) tokenJSONBlob, err := readURL(p.tokenEndpoint, p.client)
if err != nil { if err != nil {
@ -72,7 +72,7 @@ func (p *provider) Provide(image string) (map[string]credentialproviderv1beta1.A
return cfg, err return cfg, err
} }
authConfig := credentialproviderv1beta1.AuthConfig{ authConfig := credentialproviderv1.AuthConfig{
Username: "_token", Username: "_token",
Password: parsedBlob.AccessToken, Password: parsedBlob.AccessToken,
} }