From ec7ad7e9fb23307bb6aafb0e49560d135b8fdd0f Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Tue, 12 Oct 2021 22:31:12 +0530 Subject: [PATCH 1/9] adding key and user Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index f72ced2a4f0..eb756431f55 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -47,6 +47,8 @@ timeout_arg="" system_spec_name=${SYSTEM_SPEC_NAME:-} extra_envs=${EXTRA_ENVS:-} runtime_config=${RUNTIME_CONFIG:-} +ssh_user=${SSH_USER:-} +ssh_key=${SSH_KEY:-} # Parse the flags to pass to ginkgo ginkgoflags="" @@ -170,6 +172,7 @@ if [ "${remote}" = true ] ; then --delete-instances="${delete_instances}" --test_args="${test_args}" --instance-metadata="${metadata}" \ --image-config-file="${image_config_file}" --system-spec-name="${system_spec_name}" \ --runtime-config="${runtime_config}" --preemptible-instances="${preemptible_instances}" \ + --ssh-user="${ssh_user}" --ssh-key="${ssh_key}" \ --extra-envs="${extra_envs}" --test-suite="${test_suite}" \ "${timeout_arg}" \ 2>&1 | tee -i "${artifacts}/build-log.txt" From be3c851085646636ded611427c9dcd2ec7e2da24 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Wed, 13 Oct 2021 01:02:38 +0530 Subject: [PATCH 2/9] ssh key Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index eb756431f55..54f6645b5af 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -48,7 +48,7 @@ system_spec_name=${SYSTEM_SPEC_NAME:-} extra_envs=${EXTRA_ENVS:-} runtime_config=${RUNTIME_CONFIG:-} ssh_user=${SSH_USER:-} -ssh_key=${SSH_KEY:-} +ssh_key=${SSH_KEY:-${GCE_SSH_PRIVATE_KEY_FILE:-${USER}/.ssh/google_compute_engine}} # Parse the flags to pass to ginkgo ginkgoflags="" From b99c2f48941c6a7a4c4a3e187b3e2a8a12759927 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Thu, 14 Oct 2021 23:59:57 +0530 Subject: [PATCH 3/9] SSH_USER:- Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index 54f6645b5af..dff89472132 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -47,7 +47,7 @@ timeout_arg="" system_spec_name=${SYSTEM_SPEC_NAME:-} extra_envs=${EXTRA_ENVS:-} runtime_config=${RUNTIME_CONFIG:-} -ssh_user=${SSH_USER:-} +ssh_user=${SSH_USER:-${USER}} ssh_key=${SSH_KEY:-${GCE_SSH_PRIVATE_KEY_FILE:-${USER}/.ssh/google_compute_engine}} # Parse the flags to pass to ginkgo From 85d16760f06c1f9dce0974bccec242d7859bfc51 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Tue, 19 Oct 2021 00:07:36 +0530 Subject: [PATCH 4/9] adding defaultGceKey in remote/ssh.go Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 2 +- test/e2e_node/remote/ssh.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index dff89472132..2da168ff265 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -48,7 +48,7 @@ system_spec_name=${SYSTEM_SPEC_NAME:-} extra_envs=${EXTRA_ENVS:-} runtime_config=${RUNTIME_CONFIG:-} ssh_user=${SSH_USER:-${USER}} -ssh_key=${SSH_KEY:-${GCE_SSH_PRIVATE_KEY_FILE:-${USER}/.ssh/google_compute_engine}} +ssh_key=${SSH_KEY:-} # Parse the flags to pass to ginkgo ginkgoflags="" diff --git a/test/e2e_node/remote/ssh.go b/test/e2e_node/remote/ssh.go index 87a069a871f..eefa1000924 100644 --- a/test/e2e_node/remote/ssh.go +++ b/test/e2e_node/remote/ssh.go @@ -44,8 +44,12 @@ func init() { sshOptionsMap = map[string]string{ "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{ - "gce": fmt.Sprintf("%s/.ssh/google_compute_engine", usr.HomeDir), + "gce": defaultGceKey, } } From ebb2f426c3ec85d0b4369584913ff94a0e9a7567 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Tue, 19 Oct 2021 00:21:37 +0530 Subject: [PATCH 5/9] adding SSH_KEY desc to makefile Signed-off-by: Namanl2001 --- build/root/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/root/Makefile b/build/root/Makefile index d0d69ab1602..3914aa67cd2 100644 --- a/build/root/Makefile +++ b/build/root/Makefile @@ -254,6 +254,7 @@ define TEST_E2E_NODE_HELP_INFO # GUBERNATOR: For REMOTE=true only. Produce link to Gubernator to view logs. # Defaults to false. # TEST_SUITE: For REMOTE=true only. Test suite to use. Defaults to "default". +# SSH_KEY: For existing SSH keys. # # Example: # make test-e2e-node FOCUS=Kubelet SKIP=container From 1b69338460967fe98d2bd530f9efe86bbfa8ec29 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Tue, 19 Oct 2021 21:57:42 +0530 Subject: [PATCH 6/9] amending desc in makefile Signed-off-by: Namanl2001 --- build/root/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/root/Makefile b/build/root/Makefile index 3914aa67cd2..de60c5edb4b 100644 --- a/build/root/Makefile +++ b/build/root/Makefile @@ -254,7 +254,7 @@ define TEST_E2E_NODE_HELP_INFO # GUBERNATOR: For REMOTE=true only. Produce link to Gubernator to view logs. # Defaults to false. # TEST_SUITE: For REMOTE=true only. Test suite to use. Defaults to "default". -# SSH_KEY: For existing SSH keys. +# SSH_KEY: For REMOTE=true only. Path to SSH key to use. # # Example: # make test-e2e-node FOCUS=Kubelet SKIP=container From dda8248a0edddae4b701244beee61bab09103b97 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Tue, 19 Oct 2021 21:59:05 +0530 Subject: [PATCH 7/9] trying quoting Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index 2da168ff265..c6adb8b1b4b 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -47,7 +47,7 @@ timeout_arg="" system_spec_name=${SYSTEM_SPEC_NAME:-} extra_envs=${EXTRA_ENVS:-} runtime_config=${RUNTIME_CONFIG:-} -ssh_user=${SSH_USER:-${USER}} +ssh_user=${SSH_USER:-"${USER}"} ssh_key=${SSH_KEY:-} # Parse the flags to pass to ginkgo From c6e0564f53e19baf30fe6ef1fc841a723db57f73 Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Tue, 19 Oct 2021 23:30:01 +0530 Subject: [PATCH 8/9] adding quote in SSH_KEY Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index c6adb8b1b4b..82c2ddaf17a 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -48,7 +48,7 @@ system_spec_name=${SYSTEM_SPEC_NAME:-} extra_envs=${EXTRA_ENVS:-} runtime_config=${RUNTIME_CONFIG:-} ssh_user=${SSH_USER:-"${USER}"} -ssh_key=${SSH_KEY:-} +ssh_key=${SSH_KEY:-""} # Parse the flags to pass to ginkgo ginkgoflags="" From d72179625971ba4db89362f44b62703a08426f8f Mon Sep 17 00:00:00 2001 From: Namanl2001 Date: Wed, 20 Oct 2021 01:05:41 +0530 Subject: [PATCH 9/9] reverted previous commit change Signed-off-by: Namanl2001 --- hack/make-rules/test-e2e-node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh index 82c2ddaf17a..c6adb8b1b4b 100755 --- a/hack/make-rules/test-e2e-node.sh +++ b/hack/make-rules/test-e2e-node.sh @@ -48,7 +48,7 @@ system_spec_name=${SYSTEM_SPEC_NAME:-} extra_envs=${EXTRA_ENVS:-} runtime_config=${RUNTIME_CONFIG:-} ssh_user=${SSH_USER:-"${USER}"} -ssh_key=${SSH_KEY:-""} +ssh_key=${SSH_KEY:-} # Parse the flags to pass to ginkgo ginkgoflags=""