Update from review

deploy/scripts/install-combine.sh

@@ -175,16 +175,13 @@ next-state () {
 # Verify that the required network devices have been setup
 # for Kubernetes cluster
 wait-for-k8s-interfaces () {
-  date
   echo "Waiting for k8s interfaces"
-  while ! ip link show flannel.1 > /dev/null 2>&1 ; do
-    sleep 1
-  done
-  while ! ip link show cni0  > /dev/null 2>&1 ; do
-    sleep 1
+  for interface in $@ ; do
+    while ! ip link show $interface > /dev/null 2>&1 ; do
+      sleep 1
+    done
   done
   echo "Interfaces ready"
-  date
 }
 
 #####
@@ -258,7 +255,7 @@ while [ "$STATE" != "Done" ] ; do
   case $STATE in
     Pre-reqs)
       install-kubernetes
-      wait-for-k8s-interfaces
+      wait-for-k8s-interfaces flannel.1 cni0
       next-state "Restart"
       ;;
     Restart)

deploy/scripts/kube_env.py

@@ -76,7 +76,7 @@ def get_kubectl_opts(self) -> List[str]:
 
 
 def add_helm_opts(parser: argparse.ArgumentParser) -> None:
-    """Add commandline arguments for Helm."""
+    """Add command line arguments for Helm."""
     parser.add_argument(
         "--dry-run",
         action="store_true",

deploy/scripts/package_images.py

@@ -22,7 +22,6 @@
 scripts_dir = Path(__file__).resolve().parent
 ansible_dir = scripts_dir.parent / "ansible"
 helm_dir = scripts_dir.parent / "helm"
-config_dir = scripts_dir / "setup_files" / "combine_config.yaml"
 
 
 def parse_args() -> argparse.Namespace:
@@ -173,8 +172,8 @@ def main() -> None:
     # Clear the AWS variables so that they don't end up in the installer
     os.environ["AWS_ACCESS_KEY_ID"] = ""
     os.environ["AWS_SECRET_ACCESS_KEY"] = ""
-    os.environ["AWS_SECRET_ACCESS_KEY"] = ""
-    os.environ["AWS_SECRET_ACCESS_KEY"] = ""
+    os.environ["AWS_ACCOUNT"] = ""
+    os.environ["AWS_DEFAULT_REGION"] = ""
 
     # Update helm repos
     package_k3s(image_dir)

deploy/scripts/setup_files/cluster_config.yaml

@@ -7,7 +7,7 @@ clusters:
     - nginx-ingress-controller
   rancher:
     - rancher-ui
-  cert-mgr:
+  cert-manager:
     - cert-manager
   ingress:
     - nginx-ingress-controller

installer/make-combine-installer.sh

@@ -50,7 +50,7 @@ if [[ $NET_INSTALL == 0 ]] ; then
   python -m pip install --upgrade pip pip-tools
   python -m piptools sync requirements.txt
 
-  # Package the so that the Combine can be installed "offline"
+  # Package the Combine for "offline" installation
   TEMP_DIR=/tmp/images-$$
   pushd scripts
   ./package_images.py ${COMBINE_VERSION} ${TEMP_DIR}
@@ -66,7 +66,7 @@ if [[ $NET_INSTALL == 0 ]] ; then
   tar czf ${TEMP_DIR}/venv.tar.gz venv
   rm -rf venv
 else
-  # Package the so that the Combine can be installed over the network
+  # Package the Combine for network installation
   INSTALLER_NAME="combine-net-installer.run"
 fi