From 2478a505343367abd8287029152da1bc240604a7 Mon Sep 17 00:00:00 2001
From: Aman Nijhawan <anijhawan@yugabyte.com>
Date: Thu, 19 Sep 2024 06:03:17 +0000
Subject: [PATCH] [PLAT-13058] Remove references to public key filepath, since
 we don't need ssh keys for node agent based provisioning

Summary: [PLAT-13058] Remove references to public key filepath, since we don't need ssh keys for node agent based provisioning

Test Plan: manual

Reviewers: svarshney

Reviewed By: svarshney

Subscribers: svc_phabricator, yugaware

Differential Revision: https://phorge.dev.yugabyte.com/D37867
---
 .../resources/node-agent-provision.yaml       |  1 +
 .../resources/ynp/configs/config.j2           |  1 -
 .../provision/yugabyte/templates/run.j2       | 30 -------------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/managed/node-agent/resources/node-agent-provision.yaml b/managed/node-agent/resources/node-agent-provision.yaml
index 68e04984ac7c..5120d3bfee5c 100644
--- a/managed/node-agent/resources/node-agent-provision.yaml
+++ b/managed/node-agent/resources/node-agent-provision.yaml
@@ -16,6 +16,7 @@ ynp:
 
   # Indicates if the node is in an air-gapped environment (no internet access).
   # Set to 'true' if the node cannot access external networks.
+  # Airgapped
   is_airgap: false
 
   # Determines whether to use system-level systemd for service management.
diff --git a/managed/node-agent/resources/ynp/configs/config.j2 b/managed/node-agent/resources/ynp/configs/config.j2
index 21bbf3c952c5..7e4b0c70cf69 100644
--- a/managed/node-agent/resources/ynp/configs/config.j2
+++ b/managed/node-agent/resources/ynp/configs/config.j2
@@ -19,7 +19,6 @@ chrony_servers = "{{ ynp.chrony_servers | join(', ') }}"
 [CreateYugabyteUser]
 yb_user_id = {{ ynp.yb_user_id }}
 yb_user_password =
-public_key_filepath = {{ ynp.public_key_filepath }}
 
 [ConfigureSystemd]
 user_name = yugabyte
diff --git a/managed/node-agent/resources/ynp/modules/provision/yugabyte/templates/run.j2 b/managed/node-agent/resources/ynp/modules/provision/yugabyte/templates/run.j2
index 34f6ec465491..e604a95dab77 100644
--- a/managed/node-agent/resources/ynp/modules/provision/yugabyte/templates/run.j2
+++ b/managed/node-agent/resources/ynp/modules/provision/yugabyte/templates/run.j2
@@ -49,35 +49,5 @@ else
     echo "el8 not detected, skipping changing selinux context"
 fi
 
-# Configure the public key
-if [ -z {{ public_key_filepath }} ]; then
-    LOGGED_IN_USER="${SUDO_USER:-$USER}"
-    PUBKEY_FILE="/home/$LOGGED_IN_USER/.ssh/id_rsa.pub"
-    AUTH_KEYS_FILE="/home/$LOGGED_IN_USER/.ssh/authorized_keys"
-    PUBKEY_CONTENT=""
-
-    if [ -f "$PUBKEY_FILE" ]; then
-        PUBKEY_CONTENT=$(cat "$PUBKEY_FILE")
-    elif [ -f "$AUTH_KEYS_FILE" ]; then
-        PUBKEY_CONTENT=$(cat "$AUTH_KEYS_FILE")
-    fi
-
-    if [ -n "$PUBKEY_CONTENT" ]; then
-        su - {{ yb_user }} -c "mkdir -p /home/{{ yb_user }}/.ssh && chmod 700 /home/{{ yb_user }}/.ssh"
-
-        if ! su - {{ yb_user }} -c "grep -q '$PUBKEY_CONTENT' /home/{{ yb_user }}/.ssh/authorized_keys"; then
-            echo "$PUBKEY_CONTENT" | su - {{ yb_user }} -c "tee -a /home/{{ yb_user }}/.ssh/authorized_keys > /dev/null"
-            su - {{ yb_user }} -c "chmod 400 /home/{{ yb_user }}/.ssh/authorized_keys"
-            chown -R {{ yb_user }}:{{ yb_user }} /home/{{ yb_user }}/.ssh
-            echo "Public key added to {{ yb_user }}"
-        else
-            echo "Public key already exists for {{ yb_user }}"
-        fi
-    else
-        echo "Neither public key nor authorized_keys file found or they are empty"
-        exit 1
-    fi
-fi
-
 # Ensure the permissions for yb_home_dir are 750
 chmod 750 "{{ yb_home_dir }}"