From 0e93643e74f26bfc062a81c2f05ad947550f8d50 Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Tue, 4 Jan 2022 14:37:01 -0800
Subject: [PATCH] Don't touch ssh config in pod11 deploy

The authorized key installed into the workload cluster is the existing
jump server's identity.

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Ifcf2e2418f7feded1349b2d84c4791fc73512e83
---
 deploy/site/pod11/pod11.sh | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/deploy/site/pod11/pod11.sh b/deploy/site/pod11/pod11.sh
index c031495..c3dee97 100755
--- a/deploy/site/pod11/pod11.sh
+++ b/deploy/site/pod11/pod11.sh
@@ -36,28 +36,6 @@ function is_control_plane_ready {
     [[ $(kubectl --kubeconfig=${BUILDDIR}/icn-admin.conf get nodes -l node-role.kubernetes.io/control-plane -o jsonpath='{range .items[*]}{.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' | grep -c True) == ${replicas} ]]
 }
 
-function insert_control_plane_network_identity_into_ssh_config {
-    # This enables logging into the control plane machines from this
-    # machine without specifying the identify file on the command line
-
-    # Create ssh config if it doesn't exist
-    mkdir -p ${HOME}/.ssh && chmod 700 ${HOME}/.ssh
-    touch ${HOME}/.ssh/config
-    chmod 600 ${HOME}/.ssh/config
-    # Add the entry for the control plane network, host value in ssh
-    # config is a wildcard
-    endpoint=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlaneEndpoint:/ {print $2}')
-    prefix=$(helm -n metal3 get values -a cluster-icn | awk '/controlPlanePrefix:/ {print $2}')
-    host=$(ipcalc ${endpoint}/${prefix} | awk '/Network:/ {sub(/\.0.*/,".*"); print $2}')
-    if [[ $(grep -c "Host ${host}" ${HOME}/.ssh/config) != 0 ]]; then
-	sed -i -e '/Host '"${host}"'/,+1 d' ${HOME}/.ssh/config
-    fi
-    cat <<EOF >>${HOME}/.ssh/config
-Host ${host}
-  IdentityFile ${SCRIPTDIR}/id_rsa
-EOF
-}
-
 function wait_for_all_ready {
     WAIT_FOR_INTERVAL=60s
     WAIT_FOR_TRIES=30
@@ -65,7 +43,6 @@ function wait_for_all_ready {
     clusterctl -n metal3 get kubeconfig icn >${BUILDDIR}/icn-admin.conf
     chmod 600 ${BUILDDIR}/icn-admin.conf
     wait_for is_control_plane_ready
-    insert_control_plane_network_identity_into_ssh_config
 }
 
 case $1 in
-- 
2.16.6