From a4b79590ebaa77d63166c0141b7ce12e21875b2b Mon Sep 17 00:00:00 2001 From: Andrew Sy Kim Date: Thu, 17 Mar 2022 21:36:20 -0400 Subject: [PATCH] move cluster/gce/gci/credential-provider to test/e2e_node/plugins/gcp-credential-provider Signed-off-by: Andrew Sy Kim --- test/e2e_node/builder/build.go | 2 +- .../e2e_node/plugins/gcp-credential-provider}/README.md | 4 ++-- .../e2e_node/plugins/gcp-credential-provider}/main.go | 0 .../e2e_node/plugins/gcp-credential-provider}/main_test.go | 0 .../e2e_node/plugins/gcp-credential-provider}/provider.go | 0 test/e2e_node/remote/node_e2e.go | 2 +- test/e2e_node/remote/utils.go | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename {cluster/gce/gci/credential-provider => test/e2e_node/plugins/gcp-credential-provider}/README.md (90%) rename {cluster/gce/gci/credential-provider => test/e2e_node/plugins/gcp-credential-provider}/main.go (100%) rename {cluster/gce/gci/credential-provider => test/e2e_node/plugins/gcp-credential-provider}/main_test.go (100%) rename {cluster/gce/gci/credential-provider => test/e2e_node/plugins/gcp-credential-provider}/provider.go (100%) diff --git a/test/e2e_node/builder/build.go b/test/e2e_node/builder/build.go index afaf3341ba0..ab5576b348a 100644 --- a/test/e2e_node/builder/build.go +++ b/test/e2e_node/builder/build.go @@ -35,7 +35,7 @@ var buildTargets = []string{ "test/e2e_node/e2e_node.test", "vendor/github.com/onsi/ginkgo/ginkgo", "cluster/gce/gci/mounter", - "cluster/gce/gci/credential-provider", + "test/e2e_node/plugins/gcp-credential-provider", } // BuildGo builds k8s binaries. diff --git a/cluster/gce/gci/credential-provider/README.md b/test/e2e_node/plugins/gcp-credential-provider/README.md similarity index 90% rename from cluster/gce/gci/credential-provider/README.md rename to test/e2e_node/plugins/gcp-credential-provider/README.md index 1c3bde27c4e..2a63d95398c 100644 --- a/cluster/gce/gci/credential-provider/README.md +++ b/test/e2e_node/plugins/gcp-credential-provider/README.md @@ -6,7 +6,7 @@ for testing purposes only. This plugin SHOULD NOT be used in production. This credential provider is installed and configured in the node e2e tests by: -1. Building the credential-provider binary and including it in the test archive +1. Building the gcp-credential-provider binary and including it in the test archive uploaded to the GCE remote node. 2. Writing the credential provider config into the temporary workspace consumed @@ -16,7 +16,7 @@ This credential provider is installed and configured in the node e2e tests by: kind: CredentialProviderConfig apiVersion: kubelet.config.k8s.io/v1alpha1 providers: - - name: credential-provider + - name: gcp-credential-provider apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1 matchImages: - "gcr.io" diff --git a/cluster/gce/gci/credential-provider/main.go b/test/e2e_node/plugins/gcp-credential-provider/main.go similarity index 100% rename from cluster/gce/gci/credential-provider/main.go rename to test/e2e_node/plugins/gcp-credential-provider/main.go diff --git a/cluster/gce/gci/credential-provider/main_test.go b/test/e2e_node/plugins/gcp-credential-provider/main_test.go similarity index 100% rename from cluster/gce/gci/credential-provider/main_test.go rename to test/e2e_node/plugins/gcp-credential-provider/main_test.go diff --git a/cluster/gce/gci/credential-provider/provider.go b/test/e2e_node/plugins/gcp-credential-provider/provider.go similarity index 100% rename from cluster/gce/gci/credential-provider/provider.go rename to test/e2e_node/plugins/gcp-credential-provider/provider.go diff --git a/test/e2e_node/remote/node_e2e.go b/test/e2e_node/remote/node_e2e.go index 4d7b7732578..66be4d4d4fc 100644 --- a/test/e2e_node/remote/node_e2e.go +++ b/test/e2e_node/remote/node_e2e.go @@ -60,7 +60,7 @@ func (n *NodeE2ERemote) SetupTestPackage(tardir, systemSpecName string) error { } // Copy binaries - requiredBins := []string{"kubelet", "e2e_node.test", "ginkgo", "mounter", "credential-provider"} + requiredBins := []string{"kubelet", "e2e_node.test", "ginkgo", "mounter", "gcp-credential-provider"} for _, bin := range requiredBins { source := filepath.Join(buildOutputDir, bin) if _, err := os.Stat(source); err != nil { diff --git a/test/e2e_node/remote/utils.go b/test/e2e_node/remote/utils.go index 7751ad9bb2c..29bd2fa9493 100644 --- a/test/e2e_node/remote/utils.go +++ b/test/e2e_node/remote/utils.go @@ -51,7 +51,7 @@ const cniConfig = `{ const credentialProviderConfig = `kind: CredentialProviderConfig apiVersion: kubelet.config.k8s.io/v1alpha1 providers: - - name: credential-provider + - name: gcp-credential-provider apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1 matchImages: - "gcr.io"