Fix for GoogleCloudPlatform#24

luccareinehr · Nov 18, 2021 · 843ffab · 843ffab
1 parent a9c5307
commit 843ffab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/radlab-launcher/cloud_sdk_installer.py → ...ab-launcher/cloudsdk_kubectl_installer.py b/radlab-launcher/cloud_sdk_installer.py → ...ab-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
@@ -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__":