WIP: add aws-curvenote to deploy.py

Author: manics

deploy.py

@@ -29,6 +29,8 @@
     "prod": "us-central1",
 }
 
+AWS_DEPLOYMENTS = {"aws-curvenote": "binderhub"}
+
 # Mapping of cluster names (keys) to resource group names (values) for Azure deployments
 AZURE_RGs = {}
 
@@ -41,7 +43,7 @@ def check_call(*args):
     Print a command if DRY_RUN is true, otherwise run it with subprocess.check_call
     """
     if DRY_RUN:
-        print("dry-run: ".join(*args))
+        print("dry-run:", " ".join(*args))
     else:
         subprocess.check_call(*args)
 
@@ -51,7 +53,8 @@ def check_output(*args):
     Print a command if DRY_RUN is true, otherwise run it with subprocess.check_output
     """
     if DRY_RUN:
-        print("dry-run: ".join(*args))
+        print("dry-run:", " ".join(*args))
+        return b""
     else:
         return subprocess.check_output(*args)
 
@@ -138,6 +141,27 @@ def setup_auth_gcloud(release, cluster=None):
     )
 
 
+def setup_auth_aws(cluster):
+    """
+    Set up authentication for EKS on AWS
+
+    Assumes you already have an AWS CLI profile setup with access to EKS,
+    and that either this is the default profile (e.g. on CI) or you have set the
+    AWS_PROFILE environment variable.
+    """
+    print(f"Obtaining AWS EKS kubeconfig for {cluster}")
+
+    eks_kubeconfig = [
+        "aws",
+        "eks",
+        "update-kubeconfig",
+        "--name",
+        AWS_DEPLOYMENTS[cluster],
+    ]
+    stdout = check_output(eks_kubeconfig)
+    print(stdout.decode("utf8"))
+
+
 def update_networkbans(cluster):
     """
     Run secrets/ban.py to update network bans
@@ -163,7 +187,9 @@ def get_config_files(release, config_dir="config"):
     )
     # release-specific config files
     for config_dir in (config_dir, os.path.join("secrets", config_dir)):
-        config_files.append(os.path.join(config_dir, release + ".yaml"))
+        f = os.path.join(config_dir, release + ".yaml")
+        if os.path.exists(f):
+            config_files.append(f)
     return config_files
 
 
@@ -303,6 +329,41 @@ def patch_coredns():
     )
 
 
+def deploy_kube_system_charts(release, name=None):
+    """
+    Some charts must be deployed into the kube-system namespace
+    """
+    if not name:
+        name = release
+    log_name = f"mybinder-kube-system {release}"
+
+    config_files = get_config_files(release, config_dir="config-kube-system")
+    if not config_files:
+        print(BOLD + GREEN + f"No config files found for {log_name}" + NC, flush=True)
+        return
+
+    print(BOLD + GREEN + f"Starting helm upgrade for {log_name}" + NC, flush=True)
+    helm = [
+        "helm",
+        "upgrade",
+        "--install",
+        "--cleanup-on-fail",
+        "--namespace=kube-system",
+        name,
+        "mybinder-kube-system",
+    ]
+    for config_file in config_files:
+        helm.extend(["-f", config_file])
+
+    check_call(helm)
+    print(
+        BOLD + GREEN + f"SUCCESS: Helm upgrade for {log_name} completed" + NC,
+        flush=True,
+    )
+
+    wait_for_deployments_daemonsets("kube-system")
+
+
 def main():
     # parse command line args
     argparser = argparse.ArgumentParser()
@@ -314,6 +375,7 @@ def main():
             "prod",
             "ovh",
             "ovh2",
+            "aws-curvenote",
         ],
     )
     argparser.add_argument(
@@ -372,10 +434,13 @@ def main():
             setup_auth_azure(cluster)
         elif cluster in GCP_PROJECTS:
             setup_auth_gcloud(args.release, cluster)
+        elif cluster in AWS_DEPLOYMENTS:
+            setup_auth_aws(cluster)
         else:
             raise Exception("Cloud cluster not recognised!")
 
     update_networkbans(cluster)
+    deploy_kube_system_charts(args.release, args.name)
     deploy(args.release, args.name)