From 1dbec1ef30b9d3c61e09e817d813ce5db12434d3 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 24 Jul 2017 12:28:45 +0100 Subject: [PATCH] kubernetes: inline ssh.sh into ssh_into_kubelet.sh Signed-off-by: Ian Campbell --- projects/kubernetes/ssh.sh | 13 ------------- projects/kubernetes/ssh_into_kubelet.sh | 9 ++++++++- 2 files changed, 8 insertions(+), 14 deletions(-) delete mode 100755 projects/kubernetes/ssh.sh diff --git a/projects/kubernetes/ssh.sh b/projects/kubernetes/ssh.sh deleted file mode 100755 index 2a29393c6..000000000 --- a/projects/kubernetes/ssh.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -eux -docker run \ - --rm \ - -ti \ - -v ~/.ssh/:/root/.ssh \ - jdeathe/centos-ssh \ - ssh \ - -o Compression=yes \ - -o LogLevel=FATAL \ - -o StrictHostKeyChecking=no \ - -o UserKnownHostsFile=/dev/null \ - -o IdentitiesOnly=yes \ - "$@" diff --git a/projects/kubernetes/ssh_into_kubelet.sh b/projects/kubernetes/ssh_into_kubelet.sh index 74ba0ad6f..17da1a8a2 100755 --- a/projects/kubernetes/ssh_into_kubelet.sh +++ b/projects/kubernetes/ssh_into_kubelet.sh @@ -1,2 +1,9 @@ #!/bin/bash -eux -./ssh.sh -t root@"$1" ctr exec --tty --exec-id ssh kubelet ash -l +ssh="docker run --rm -ti \ + -v $HOME/.ssh/:/root/.ssh \ + jdeathe/centos-ssh \ + -o LogLevel=FATAL \ + -o StrictHostKeyChecking=no \ + -o UserKnownHostsFile=/dev/null \ + -o IdentitiesOnly=yes" +$ssh -t root@"$1" ctr exec --tty --exec-id ssh kubelet ash -l