move cluster/gce/gci/credential-provider to test/e2e_node/plugins/gcp-credential-provider

Signed-off-by: Andrew Sy Kim <andrewsy@google.com>
This commit is contained in:
Andrew Sy Kim 2022-03-17 21:36:20 -04:00
parent 3bd37e6deb
commit a4b79590eb
7 changed files with 5 additions and 5 deletions

View File

@ -35,7 +35,7 @@ var buildTargets = []string{
"test/e2e_node/e2e_node.test", "test/e2e_node/e2e_node.test",
"vendor/github.com/onsi/ginkgo/ginkgo", "vendor/github.com/onsi/ginkgo/ginkgo",
"cluster/gce/gci/mounter", "cluster/gce/gci/mounter",
"cluster/gce/gci/credential-provider", "test/e2e_node/plugins/gcp-credential-provider",
} }
// BuildGo builds k8s binaries. // BuildGo builds k8s binaries.

View File

@ -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: 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. uploaded to the GCE remote node.
2. Writing the credential provider config into the temporary workspace consumed 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 kind: CredentialProviderConfig
apiVersion: kubelet.config.k8s.io/v1alpha1 apiVersion: kubelet.config.k8s.io/v1alpha1
providers: providers:
- name: credential-provider - name: gcp-credential-provider
apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1 apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1
matchImages: matchImages:
- "gcr.io" - "gcr.io"

View File

@ -60,7 +60,7 @@ func (n *NodeE2ERemote) SetupTestPackage(tardir, systemSpecName string) error {
} }
// Copy binaries // 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 { for _, bin := range requiredBins {
source := filepath.Join(buildOutputDir, bin) source := filepath.Join(buildOutputDir, bin)
if _, err := os.Stat(source); err != nil { if _, err := os.Stat(source); err != nil {

View File

@ -51,7 +51,7 @@ const cniConfig = `{
const credentialProviderConfig = `kind: CredentialProviderConfig const credentialProviderConfig = `kind: CredentialProviderConfig
apiVersion: kubelet.config.k8s.io/v1alpha1 apiVersion: kubelet.config.k8s.io/v1alpha1
providers: providers:
- name: credential-provider - name: gcp-credential-provider
apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1 apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1
matchImages: matchImages:
- "gcr.io" - "gcr.io"