github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #109006 from andrewsykim/kubelet-cred-provider-e2e-beta

Browse Source 
test/e2e_node: update kubelet credential provider tests to use new v1beta1 APIs
This commit is contained in:
Kubernetes Prow Robot
2022-03-25 18:08:24 -07:00
committed by GitHub
parent c239b406f0 45e6498fc5
commit 6efd6582df
4 changed files with 13 additions and 13 deletions
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"
"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,
}

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

@@ -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 {

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

@@ -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,
}

4
test/e2e_node/remote/utils.go
View File

@@ -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"