From ef3c4fb3cda89736a6d0ae1598bc2573a509f5b8 Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Thu, 24 Mar 2022 23:13:12 -0400 Subject: [PATCH 1/3] test/e2e_node: update credential provider config to use v1beta1 kubelet APIs Signed-off-by: Andrew Sy Kim --- test/e2e_node/remote/utils.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e_node/remote/utils.go b/test/e2e_node/remote/utils.go index 29bd2fa9493..657ff8089a6 100644 --- a/test/e2e_node/remote/utils.go +++ b/test/e2e_node/remote/utils.go @@ -49,10 +49,10 @@ const cniConfig = `{ ` const credentialProviderConfig = `kind: CredentialProviderConfig -apiVersion: kubelet.config.k8s.io/v1alpha1 +apiVersion: kubelet.config.k8s.io/v1beta1 providers: - name: gcp-credential-provider - apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1 + apiVersion: credentialprovider.kubelet.k8s.io/v1beta1 matchImages: - "gcr.io" - "*.gcr.io" From 3600a7a355af2c8646fc81177190cfc4b14e099b Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Thu, 24 Mar 2022 23:13:35 -0400 Subject: [PATCH 2/3] test/e2e_node: update test plugin to use v1beta1 kubelet APIs Signed-off-by: Andrew Sy Kim --- 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 79215a4e2ae..543057d1e08 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" - credentialproviderv1alpha1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1alpha1" + credentialproviderv1beta1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1" ) 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 credentialproviderv1alpha1.CredentialProviderRequest + var authRequest credentialproviderv1beta1.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 := &credentialproviderv1alpha1.CredentialProviderResponse{ + response := &credentialproviderv1beta1.CredentialProviderResponse{ TypeMeta: metav1.TypeMeta{ Kind: "CredentialProviderResponse", - APIVersion: "credentialprovider.kubelet.k8s.io/v1alpha1", + APIVersion: "credentialprovider.kubelet.k8s.io/v1beta1", }, - CacheKeyType: credentialproviderv1alpha1.RegistryPluginCacheKeyType, + CacheKeyType: credentialproviderv1beta1.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 caf0fde489f..59ff39febc2 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" - credentialproviderv1alpha1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1alpha1" + credentialproviderv1beta1 "k8s.io/kubelet/pkg/apis/credentialprovider/v1beta1" ) const ( @@ -59,8 +59,8 @@ type provider struct { tokenEndpoint string } -func (p *provider) Provide(image string) (map[string]credentialproviderv1alpha1.AuthConfig, error) { - cfg := map[string]credentialproviderv1alpha1.AuthConfig{} +func (p *provider) Provide(image string) (map[string]credentialproviderv1beta1.AuthConfig, error) { + cfg := map[string]credentialproviderv1beta1.AuthConfig{} tokenJSONBlob, err := readURL(p.tokenEndpoint, p.client) if err != nil { @@ -72,7 +72,7 @@ func (p *provider) Provide(image string) (map[string]credentialproviderv1alpha1. return cfg, err } - authConfig := credentialproviderv1alpha1.AuthConfig{ + authConfig := credentialproviderv1beta1.AuthConfig{ Username: "_token", Password: parsedBlob.AccessToken, } From 45e6498fc5b2f5b4c72be08764f32fb29e5dd0ca Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Thu, 24 Mar 2022 23:28:00 -0400 Subject: [PATCH 3/3] test/e2e_node/plugins/gcp-credential-provider: update Test_getCredentials to validate against v1beta1 kubelet APIs Signed-off-by: Andrew Sy Kim --- test/e2e_node/plugins/gcp-credential-provider/main_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e_node/plugins/gcp-credential-provider/main_test.go b/test/e2e_node/plugins/gcp-credential-provider/main_test.go index 1aec604dd49..684e92450fa 100644 --- a/test/e2e_node/plugins/gcp-credential-provider/main_test.go +++ b/test/e2e_node/plugins/gcp-credential-provider/main_test.go @@ -36,7 +36,7 @@ func Test_getCredentials(t *testing.T) { server := httptest.NewServer(&fakeTokenServer{token: "abc123"}) defer server.Close() - in := bytes.NewBuffer([]byte(`{"kind":"CredentialProviderRequest","apiVersion":"credentialprovider.kubelet.k8s.io/v1alpha1","image":"gcr.io/foobar"}`)) + in := bytes.NewBuffer([]byte(`{"kind":"CredentialProviderRequest","apiVersion":"credentialprovider.kubelet.k8s.io/v1beta1","image":"gcr.io/foobar"}`)) out := bytes.NewBuffer(nil) err := getCredentials(server.URL, in, out) @@ -44,7 +44,7 @@ func Test_getCredentials(t *testing.T) { t.Fatalf("unexpected error running getCredentials: %v", err) } - expected := `{"kind":"CredentialProviderResponse","apiVersion":"credentialprovider.kubelet.k8s.io/v1alpha1","cacheKeyType":"Registry","auth":{"*.gcr.io":{"username":"_token","password":"abc123"},"*.pkg.dev":{"username":"_token","password":"abc123"},"container.cloud.google.com":{"username":"_token","password":"abc123"},"gcr.io":{"username":"_token","password":"abc123"}}} + expected := `{"kind":"CredentialProviderResponse","apiVersion":"credentialprovider.kubelet.k8s.io/v1beta1","cacheKeyType":"Registry","auth":{"*.gcr.io":{"username":"_token","password":"abc123"},"*.pkg.dev":{"username":"_token","password":"abc123"},"container.cloud.google.com":{"username":"_token","password":"abc123"},"gcr.io":{"username":"_token","password":"abc123"}}} ` if out.String() != expected {