From 45aa3a72e8a890aa9067ee9294b84c38445d615a Mon Sep 17 00:00:00 2001 From: Bradley Date: Mon, 8 May 2017 21:51:33 +0100 Subject: [PATCH 1/3] Added -A flag to ssh connection --- cmd/kops/update_cluster.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go index 77dec7b3e5..c1d50a9d1d 100644 --- a/cmd/kops/update_cluster.go +++ b/cmd/kops/update_cluster.go @@ -282,11 +282,11 @@ func RunUpdateCluster(f *util.Factory, clusterName string, out io.Writer, c *Upd fmt.Fprintf(sb, " * validate cluster: kops validate cluster\n") fmt.Fprintf(sb, " * list nodes: kubectl get nodes --show-labels\n") if !usesBastion(instanceGroups) { - fmt.Fprintf(sb, " * ssh to the master: ssh -i ~/.ssh/id_rsa admin@%s\n", cluster.Spec.MasterPublicName) + fmt.Fprintf(sb, " * ssh to the master: ssh -A -i ~/.ssh/id_rsa admin@%s\n", cluster.Spec.MasterPublicName) } else { bastionPublicName := findBastionPublicName(cluster) if bastionPublicName != "" { - fmt.Fprintf(sb, " * ssh to the bastion: ssh -i ~/.ssh/id_rsa admin@%s\n", bastionPublicName) + fmt.Fprintf(sb, " * ssh to the bastion: ssh -A -i ~/.ssh/id_rsa admin@%s\n", bastionPublicName) } else { fmt.Fprintf(sb, " * to ssh to the bastion, you probably want to configure a bastionPublicName") } From 57bcec2a135c26b899f12451405a49dd9b3684a5 Mon Sep 17 00:00:00 2001 From: Bradley Date: Tue, 9 May 2017 13:07:27 +0100 Subject: [PATCH 2/3] Removed forwarding key when connecting to the master --- cmd/kops/update_cluster.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go index c1d50a9d1d..82dc787dfa 100644 --- a/cmd/kops/update_cluster.go +++ b/cmd/kops/update_cluster.go @@ -282,7 +282,7 @@ func RunUpdateCluster(f *util.Factory, clusterName string, out io.Writer, c *Upd fmt.Fprintf(sb, " * validate cluster: kops validate cluster\n") fmt.Fprintf(sb, " * list nodes: kubectl get nodes --show-labels\n") if !usesBastion(instanceGroups) { - fmt.Fprintf(sb, " * ssh to the master: ssh -A -i ~/.ssh/id_rsa admin@%s\n", cluster.Spec.MasterPublicName) + fmt.Fprintf(sb, " * ssh to the master: ssh -i ~/.ssh/id_rsa admin@%s\n", cluster.Spec.MasterPublicName) } else { bastionPublicName := findBastionPublicName(cluster) if bastionPublicName != "" { From e48684832f469d779b2c01d319c1dc4ece5a4e3c Mon Sep 17 00:00:00 2001 From: Bradley Date: Tue, 9 May 2017 22:20:10 +0100 Subject: [PATCH 3/3] Added warning about the ssh user --- cmd/kops/update_cluster.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go index 82dc787dfa..e5ade70131 100644 --- a/cmd/kops/update_cluster.go +++ b/cmd/kops/update_cluster.go @@ -291,6 +291,7 @@ func RunUpdateCluster(f *util.Factory, clusterName string, out io.Writer, c *Upd fmt.Fprintf(sb, " * to ssh to the bastion, you probably want to configure a bastionPublicName") } } + fmt.Fprintf(sb, "The admin user is specific to Debian. If not using Debian please use the appropriate user based on your OS.\n") fmt.Fprintf(sb, " * read about installing addons: https://github.com/kubernetes/kops/blob/master/docs/addons.md\n") fmt.Fprintf(sb, "\n") }