github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105637 from Namanl2001/ssh

Browse Source 
adding `--ssh-key` and `--ssh-user` for kubetest2
This commit is contained in:
Kubernetes Prow Robot 2021-10-26 16:33:45 -07:00 committed by GitHub
commit 7c715dbc68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/root/Makefile
View File

@ -254,6 +254,7 @@ define TEST_E2E_NODE_HELP_INFO
# GUBERNATOR: For REMOTE=true only. Produce link to Gubernator to view logs. # GUBERNATOR: For REMOTE=true only. Produce link to Gubernator to view logs.
# Defaults to false. # Defaults to false.
# TEST_SUITE: For REMOTE=true only. Test suite to use. Defaults to "default". # TEST_SUITE: For REMOTE=true only. Test suite to use. Defaults to "default".
# SSH_KEY: For REMOTE=true only. Path to SSH key to use.
# #
# Example: # Example:
# make test-e2e-node FOCUS=Kubelet SKIP=container # make test-e2e-node FOCUS=Kubelet SKIP=container

3
hack/make-rules/test-e2e-node.sh
View File

@ -47,6 +47,8 @@ timeout_arg=""
system_spec_name=${SYSTEM_SPEC_NAME:-} system_spec_name=${SYSTEM_SPEC_NAME:-}
extra_envs=${EXTRA_ENVS:-} extra_envs=${EXTRA_ENVS:-}
runtime_config=${RUNTIME_CONFIG:-} runtime_config=${RUNTIME_CONFIG:-}
ssh_user=${SSH_USER:-"${USER}"}
ssh_key=${SSH_KEY:-}
# Parse the flags to pass to ginkgo # Parse the flags to pass to ginkgo
ginkgoflags="" ginkgoflags=""
@ -170,6 +172,7 @@ if [ "${remote}" = true ] ; then
--delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \ --delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \
--image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \ --image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \
--runtime-config="${runtime_config}" --preemptible-instances="${preemptible_instances}" \ --runtime-config="${runtime_config}" --preemptible-instances="${preemptible_instances}" \
--ssh-user="${ssh_user}" --ssh-key="${ssh_key}" \
--extra-envs="${extra_envs}" --test-suite="${test_suite}" \ --extra-envs="${extra_envs}" --test-suite="${test_suite}" \
"${timeout_arg}" \ "${timeout_arg}" \
2>&1 | tee -i "${artifacts}/build-log.txt" 2>&1 | tee -i "${artifacts}/build-log.txt"

6
test/e2e_node/remote/ssh.go
View File

@ -44,8 +44,12 @@ func init() {
sshOptionsMap = map[string]string{ sshOptionsMap = map[string]string{
"gce": "-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o CheckHostIP=no -o StrictHostKeyChecking=no -o ServerAliveInterval=30 -o LogLevel=ERROR", "gce": "-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o CheckHostIP=no -o StrictHostKeyChecking=no -o ServerAliveInterval=30 -o LogLevel=ERROR",
} }
defaultGceKey := os.Getenv("GCE_SSH_PRIVATE_KEY_FILE")
if defaultGceKey == "" {
defaultGceKey = fmt.Sprintf("%s/.ssh/google_compute_engine", usr.HomeDir)
}
sshDefaultKeyMap = map[string]string{ sshDefaultKeyMap = map[string]string{
"gce": fmt.Sprintf("%s/.ssh/google_compute_engine", usr.HomeDir), "gce": defaultGceKey,
} }
} }