From 843ffab879efe8a2775654b9a4c321d32ad464fe Mon Sep 17 00:00:00 2001 From: Mukul Gupta Date: Thu, 18 Nov 2021 13:32:08 -0800 Subject: [PATCH] Fix for #24 --- .../{cloud_sdk_installer.py => cloudsdk_kubectl_installer.py} | 3 ++- radlab-launcher/installer_prereq.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) rename radlab-launcher/{cloud_sdk_installer.py => cloudsdk_kubectl_installer.py} (88%) diff --git a/radlab-launcher/cloud_sdk_installer.py b/radlab-launcher/cloudsdk_kubectl_installer.py similarity index 88% rename from radlab-launcher/cloud_sdk_installer.py rename to radlab-launcher/cloudsdk_kubectl_installer.py index ca8117f1..e0f2c0ba 100644 --- a/radlab-launcher/cloud_sdk_installer.py +++ b/radlab-launcher/cloudsdk_kubectl_installer.py @@ -27,10 +27,11 @@ def main(): node = platform.node().lower() if('linux' in system and 'cs-' in node): - print("Detected Cloud Shell, skipping cloud sdk installation...") + print("Detected Cloud Shell, skipping cloud sdk & kubectl installation...") else: os.system("curl https://sdk.cloud.google.com > install.sh") os.system("bash install.sh --disable-prompts") + os.system("sudo gcloud components install kubectl") if __name__ == "__main__": diff --git a/radlab-launcher/installer_prereq.py b/radlab-launcher/installer_prereq.py index fb09590d..88082f63 100644 --- a/radlab-launcher/installer_prereq.py +++ b/radlab-launcher/installer_prereq.py @@ -21,8 +21,7 @@ def main(): # Install production dependencies. os.system("pip3 install --no-cache-dir -r requirements.txt") os.system("python3 terraform_installer.py") - os.system("python3 cloud_sdk_installer.py") - os.system("sudo gcloud components install kubectl") + os.system("python3 cloudsdk_kubectl_installer.py") print("\nPRE-REQ INSTALLTION COMPLETED\n") if __name__ == "__main__":