From 50a705defe0616b8d70cecd3cda4baaaaf573c36 Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 07:47:10 -0800
Subject: [PATCH 01/13] feat: Remove MinIO

---
 .../configs.tf                                |  14 +-
 .../minio.tf                                  | 428 +++++++++---------
 .../outputs.tf                                |   2 +-
 .../variables.tf                              |  18 +-
 terraform-test/terraform_unity_sps_test.go    |   6 +-
 terraform-unity/variables.tf                  |  40 +-
 6 files changed, 254 insertions(+), 254 deletions(-)

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
index 0fbef4b..2a400ab 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
@@ -171,13 +171,13 @@ resource "kubernetes_config_map" "supervisord-orchestrator" {
   }
 }
 
-data "template_file" "datasets" {
-  template = file("${path.module}/../../hysds/configs/${var.datasets_filename}")
-  vars = {
-    minio_service_api_port       = var.service_port_map.minio_service_api
-    minio_service_interface_port = var.service_port_map.minio_service_interface
-  }
-}
+# data "template_file" "datasets" {
+#   template = file("${path.module}/../../hysds/configs/${var.datasets_filename}")
+#   vars = {
+#     minio_service_api_port       = var.service_port_map.minio_service_api
+#     minio_service_interface_port = var.service_port_map.minio_service_interface
+#   }
+# }
 
 resource "kubernetes_config_map" "datasets" {
   metadata {
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/minio.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/minio.tf
index 2ac0eca..a793827 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/minio.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/minio.tf
@@ -1,229 +1,229 @@
-resource "kubernetes_persistent_volume_claim" "minio-pv-claim" {
-  metadata {
-    name      = "minio-pv-claim"
-    namespace = kubernetes_namespace.unity-sps.metadata[0].name
-    labels = {
-      app = "minio-storage-claim"
-    }
-  }
-  spec {
-    access_modes = ["ReadWriteOnce"]
-    resources {
-      requests = {
-        storage = "20Gi"
-      }
-    }
-  }
-}
+# resource "kubernetes_persistent_volume_claim" "minio-pv-claim" {
+#   metadata {
+#     name      = "minio-pv-claim"
+#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
+#     labels = {
+#       app = "minio-storage-claim"
+#     }
+#   }
+#   spec {
+#     access_modes = ["ReadWriteOnce"]
+#     resources {
+#       requests = {
+#         storage = "20Gi"
+#       }
+#     }
+#   }
+# }
 
 
-resource "kubernetes_service" "minio-service" {
-  metadata {
-    name      = "minio"
-    namespace = kubernetes_namespace.unity-sps.metadata[0].name
-  }
+# resource "kubernetes_service" "minio-service" {
+#   metadata {
+#     name      = "minio"
+#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
+#   }
 
-  spec {
-    type             = var.service_type
-    session_affinity = var.deployment_environment != "local" ? null : "ClientIP"
-    port {
-      name        = "minio-api"
-      protocol    = "TCP"
-      port        = var.service_port_map.minio_service_api
-      target_port = 9000
-      node_port   = var.service_type != "NodePort" ? null : var.node_port_map.minio_service_api
-    }
-    port {
-      name        = "minio-interface"
-      protocol    = "TCP"
-      port        = var.service_port_map.minio_service_interface
-      target_port = 9001
-      node_port   = var.service_type != "NodePort" ? null : var.node_port_map.minio_service_interface
-    }
-    selector = {
-      app = "minio"
-    }
-  }
-}
+#   spec {
+#     type             = var.service_type
+#     session_affinity = var.deployment_environment != "local" ? null : "ClientIP"
+#     port {
+#       name        = "minio-api"
+#       protocol    = "TCP"
+#       port        = var.service_port_map.minio_service_api
+#       target_port = 9000
+#       node_port   = var.service_type != "NodePort" ? null : var.node_port_map.minio_service_api
+#     }
+#     port {
+#       name        = "minio-interface"
+#       protocol    = "TCP"
+#       port        = var.service_port_map.minio_service_interface
+#       target_port = 9001
+#       node_port   = var.service_type != "NodePort" ? null : var.node_port_map.minio_service_interface
+#     }
+#     selector = {
+#       app = "minio"
+#     }
+#   }
+# }
 
-resource "kubernetes_deployment" "minio" {
-  metadata {
-    name      = "minio"
-    namespace = kubernetes_namespace.unity-sps.metadata[0].name
-    labels = {
-      app = "minio"
-    }
-  }
+# resource "kubernetes_deployment" "minio" {
+#   metadata {
+#     name      = "minio"
+#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
+#     labels = {
+#       app = "minio"
+#     }
+#   }
 
-  spec {
-    # replicas = 2
-    selector {
-      match_labels = {
-        app = "minio"
-      }
-    }
-    strategy {
-      type = "Recreate"
-    }
+#   spec {
+#     # replicas = 2
+#     selector {
+#       match_labels = {
+#         app = "minio"
+#       }
+#     }
+#     strategy {
+#       type = "Recreate"
+#     }
 
-    template {
-      metadata {
-        labels = {
-          app = "minio"
-        }
-      }
+#     template {
+#       metadata {
+#         labels = {
+#           app = "minio"
+#         }
+#       }
 
-      spec {
-        container {
-          image = var.docker_images.minio
-          name  = "minio"
-          # security_context {
-          #   run_as_non_root = true
-          # }
-          # Run as non-root user
-          # https://docs.min.io/docs/minio-docker-quickstart-guide
-          args = ["server", "/storage", "--console-address=:9001"]
-          env {
-            name  = "MINIO_ACCESS_KEY"
-            value = "hysds"
-          }
-          env {
-            name  = "MINIO_SECRET_KEY"
-            value = "password"
-          }
-          port {
-            container_port = 9000
-            host_port      = 9000
-          }
-          port {
-            container_port = 9001
-            host_port      = 9001
-          }
-          volume_mount {
-            name       = "storage"
-            mount_path = "/storage"
-            read_only  = false
-          }
+#       spec {
+#         container {
+#           image = var.docker_images.minio
+#           name  = "minio"
+#           # security_context {
+#           #   run_as_non_root = true
+#           # }
+#           # Run as non-root user
+#           # https://docs.min.io/docs/minio-docker-quickstart-guide
+#           args = ["server", "/storage", "--console-address=:9001"]
+#           env {
+#             name  = "MINIO_ACCESS_KEY"
+#             value = "hysds"
+#           }
+#           env {
+#             name  = "MINIO_SECRET_KEY"
+#             value = "password"
+#           }
+#           port {
+#             container_port = 9000
+#             host_port      = 9000
+#           }
+#           port {
+#             container_port = 9001
+#             host_port      = 9001
+#           }
+#           volume_mount {
+#             name       = "storage"
+#             mount_path = "/storage"
+#             read_only  = false
+#           }
 
-        }
+#         }
 
-        volume {
-          name = "storage"
-          persistent_volume_claim {
-            claim_name = kubernetes_persistent_volume_claim.minio-pv-claim.metadata[0].name
-          }
-        }
-      }
-    }
-  }
-}
+#         volume {
+#           name = "storage"
+#           persistent_volume_claim {
+#             claim_name = kubernetes_persistent_volume_claim.minio-pv-claim.metadata[0].name
+#           }
+#         }
+#       }
+#     }
+#   }
+# }
 
-resource "kubernetes_job" "mc" {
-  metadata {
-    name      = "mc"
-    namespace = kubernetes_namespace.unity-sps.metadata[0].name
-  }
-  spec {
-    template {
-      metadata {}
-      spec {
-        init_container {
-          name    = "minio-setup"
-          image   = var.docker_images.mc
-          command = ["/bin/sh", "-c"]
-          args = [
-            <<-EOT
-            until curl -s -I http://minio:${var.service_port_map.minio_service_api}; do echo "(Minio server) waiting..."; sleep 2; done;
-            until curl -s -I http://minio:${var.service_port_map.minio_service_interface}; do echo "(Minio client) waiting..."; sleep 2; done;
-            while [ $$(curl -sw '%%{http_code}' "http://minio:${var.service_port_map.minio_service_api}/minio/health/live" -o /dev/null) -ne 200 ]; do
-              echo "Waiting for minio health live to be ready..." && sleep 5;
-            done;
-            mc alias set s3 http://minio:${var.service_port_map.minio_service_api} hysds password;
-            mc mb s3/datasets;
-            mc policy set public s3/datasets;
-            EOT
-          ]
-        }
-        container {
-          name    = "publish-aoi"
-          image   = var.docker_images.hysds_core
-          command = ["/bin/sh", "-c"]
-          args = [
-            <<-EOT
-            set -x;
+# resource "kubernetes_job" "mc" {
+#   metadata {
+#     name      = "mc"
+#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
+#   }
+#   spec {
+#     template {
+#       metadata {}
+#       spec {
+#         init_container {
+#           name    = "minio-setup"
+#           image   = var.docker_images.mc
+#           command = ["/bin/sh", "-c"]
+#           args = [
+#             <<-EOT
+#             until curl -s -I http://minio:${var.service_port_map.minio_service_api}; do echo "(Minio server) waiting..."; sleep 2; done;
+#             until curl -s -I http://minio:${var.service_port_map.minio_service_interface}; do echo "(Minio client) waiting..."; sleep 2; done;
+#             while [ $$(curl -sw '%%{http_code}' "http://minio:${var.service_port_map.minio_service_api}/minio/health/live" -o /dev/null) -ne 200 ]; do
+#               echo "Waiting for minio health live to be ready..." && sleep 5;
+#             done;
+#             mc alias set s3 http://minio:${var.service_port_map.minio_service_api} hysds password;
+#             mc mb s3/datasets;
+#             mc policy set public s3/datasets;
+#             EOT
+#           ]
+#         }
+#         container {
+#           name    = "publish-aoi"
+#           image   = var.docker_images.hysds_core
+#           command = ["/bin/sh", "-c"]
+#           args = [
+#             <<-EOT
+#             set -x;
 
-            curl -XGET "http://grq-es:${var.service_port_map.grq2_es}/_cluster/health?pretty=true&wait_for_status=yellow&timeout=30s";
-            while [ $$(curl -ILs http://grq2:${var.service_port_map.grq2_service}/api/v0.1/doc | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) -ne 200 ]; do
-              echo "Waiting for GRQ2 to be ready..." && sleep 5;
-            done;
+#             curl -XGET "http://grq-es:${var.service_port_map.grq2_es}/_cluster/health?pretty=true&wait_for_status=yellow&timeout=30s";
+#             while [ $$(curl -ILs http://grq2:${var.service_port_map.grq2_service}/api/v0.1/doc | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) -ne 200 ]; do
+#               echo "Waiting for GRQ2 to be ready..." && sleep 5;
+#             done;
 
-            while [ $$(curl -sw '%%{http_code}' "http://grq-es:${var.service_port_map.grq2_es}" -o /dev/null) -ne 200 ]; do
-              echo "Waiting for grq-es to be ready..." && sleep 5;
-            done;
+#             while [ $$(curl -sw '%%{http_code}' "http://grq-es:${var.service_port_map.grq2_es}" -o /dev/null) -ne 200 ]; do
+#               echo "Waiting for grq-es to be ready..." && sleep 5;
+#             done;
 
-            curl -XGET "http://mozart-es:${var.service_port_map.mozart_es}/_cluster/health?pretty=true&wait_for_status=yellow&timeout=30s";
-            while [ $$(curl -ILs http://mozart:${var.service_port_map.mozart_service}/api/v0.1/doc | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) -ne 200 ]; do
-              echo "Waiting for mozart to be ready..." && sleep 5;
-            done;
+#             curl -XGET "http://mozart-es:${var.service_port_map.mozart_es}/_cluster/health?pretty=true&wait_for_status=yellow&timeout=30s";
+#             while [ $$(curl -ILs http://mozart:${var.service_port_map.mozart_service}/api/v0.1/doc | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) -ne 200 ]; do
+#               echo "Waiting for mozart to be ready..." && sleep 5;
+#             done;
 
-            while [ $$(curl -sw '%%{http_code}' "http://mozart-es:${var.service_port_map.mozart_es}" -o /dev/null) -ne 200 ]; do
-              echo "Waiting for mozart-es to be ready..." && sleep 5;
-            done;
+#             while [ $$(curl -sw '%%{http_code}' "http://mozart-es:${var.service_port_map.mozart_es}" -o /dev/null) -ne 200 ]; do
+#               echo "Waiting for mozart-es to be ready..." && sleep 5;
+#             done;
 
-            cd /home/ops/hysds/test/examples;
-            /home/ops/hysds/scripts/ingest_dataset.py AOI_sacramento_valley /home/ops/datasets.json;
-            EOT
-          ]
-          volume_mount {
-            name       = kubernetes_config_map.celeryconfig.metadata[0].name
-            mount_path = "/home/ops/hysds/celeryconfig.py"
-            sub_path   = "celeryconfig.py"
-            read_only  = false
-          }
-          volume_mount {
-            name       = kubernetes_config_map.aws-credentials.metadata[0].name
-            mount_path = "/home/ops/.aws/credentials"
-            sub_path   = "aws-credentials"
-            read_only  = false
-          }
-          volume_mount {
-            name       = kubernetes_config_map.datasets.metadata[0].name
-            mount_path = "/home/ops/datasets.json"
-            sub_path   = "datasets.json"
-            read_only  = false
-          }
-        }
-        volume {
-          name = kubernetes_config_map.celeryconfig.metadata[0].name
-          config_map {
-            name = kubernetes_config_map.celeryconfig.metadata[0].name
-          }
-        }
-        volume {
-          name = kubernetes_config_map.aws-credentials.metadata[0].name
-          config_map {
-            name = kubernetes_config_map.aws-credentials.metadata[0].name
-          }
-        }
-        volume {
-          name = kubernetes_config_map.datasets.metadata[0].name
-          config_map {
-            name = kubernetes_config_map.datasets.metadata[0].name
-          }
-        }
-        restart_policy = "Never"
-      }
-    }
-  }
-  depends_on = [
-    kubernetes_deployment.grq2,
-    kubernetes_deployment.mozart,
-    helm_release.grq2-es,
-    helm_release.mozart-es,
-  ]
-  wait_for_completion = true
-  timeouts {
-    create = "5m"
-    update = "5m"
-  }
-}
+#             cd /home/ops/hysds/test/examples;
+#             /home/ops/hysds/scripts/ingest_dataset.py AOI_sacramento_valley /home/ops/datasets.json;
+#             EOT
+#           ]
+#           volume_mount {
+#             name       = kubernetes_config_map.celeryconfig.metadata[0].name
+#             mount_path = "/home/ops/hysds/celeryconfig.py"
+#             sub_path   = "celeryconfig.py"
+#             read_only  = false
+#           }
+#           volume_mount {
+#             name       = kubernetes_config_map.aws-credentials.metadata[0].name
+#             mount_path = "/home/ops/.aws/credentials"
+#             sub_path   = "aws-credentials"
+#             read_only  = false
+#           }
+#           volume_mount {
+#             name       = kubernetes_config_map.datasets.metadata[0].name
+#             mount_path = "/home/ops/datasets.json"
+#             sub_path   = "datasets.json"
+#             read_only  = false
+#           }
+#         }
+#         volume {
+#           name = kubernetes_config_map.celeryconfig.metadata[0].name
+#           config_map {
+#             name = kubernetes_config_map.celeryconfig.metadata[0].name
+#           }
+#         }
+#         volume {
+#           name = kubernetes_config_map.aws-credentials.metadata[0].name
+#           config_map {
+#             name = kubernetes_config_map.aws-credentials.metadata[0].name
+#           }
+#         }
+#         volume {
+#           name = kubernetes_config_map.datasets.metadata[0].name
+#           config_map {
+#             name = kubernetes_config_map.datasets.metadata[0].name
+#           }
+#         }
+#         restart_policy = "Never"
+#       }
+#     }
+#   }
+#   depends_on = [
+#     kubernetes_deployment.grq2,
+#     kubernetes_deployment.mozart,
+#     helm_release.grq2-es,
+#     helm_release.mozart-es,
+#   ]
+#   wait_for_completion = true
+#   timeouts {
+#     create = "5m"
+#     update = "5m"
+#   }
+# }
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
index 7ae7499..d832497 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
@@ -24,6 +24,6 @@ output "load_balancer_hostnames" {
     mozart_es       = data.kubernetes_service.mozart-es.status[0].load_balancer[0].ingress[0].hostname,
     grq_es          = data.kubernetes_service.grq-es.status[0].load_balancer[0].ingress[0].hostname,
     ades_wpst_api   = kubernetes_service.ades-wpst-api-service.status[0].load_balancer[0].ingress[0].hostname,
-    minio           = kubernetes_service.minio-service.status[0].load_balancer[0].ingress[0].hostname
+    # minio           = kubernetes_service.minio-service.status[0].load_balancer[0].ingress[0].hostname
   }
 }
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf
index 059480d..f9b2286 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf
@@ -37,11 +37,11 @@ variable "docker_images" {
     hysds_factotum = "ghcr.io/unity-sds/unity-sps-prototype/hysds-factotum:unity-v0.0.1"
     ades_wpst_api  = "ghcr.io/unity-sds/unity-sps-prototype/ades-wpst-api:unity-v0.0.1"
     logstash       = "docker.elastic.co/logstash/logstash:7.10.2"
-    minio          = "minio/minio:RELEASE.2022-03-17T06-34-49Z"
-    mc             = "minio/mc:RELEASE.2022-03-13T22-34-00Z"
-    rabbitmq       = "rabbitmq:3-management"
-    busybox        = "k8s.gcr.io/busybox"
-    redis          = "redis:latest"
+    # minio          = "minio/minio:RELEASE.2022-03-17T06-34-49Z"
+    # mc             = "minio/mc:RELEASE.2022-03-13T22-34-00Z"
+    rabbitmq = "rabbitmq:3-management"
+    busybox  = "k8s.gcr.io/busybox"
+    redis    = "redis:latest"
   }
 }
 
@@ -89,8 +89,8 @@ variable "service_port_map" {
     "rabbitmq_service_epmd"             = 4369
     "rabbitmq_service_listener"         = 5672
     "rabbitmq_service_cluster_rpc"      = 15672
-    "minio_service_api"                 = 9000
-    "minio_service_interface"           = 9001
+    # "minio_service_api"                 = 9000
+    # "minio_service_interface"           = 9001
     "hysds_ui_service"                  = 3000
     "redis_service"                     = 6379
     "ades_wpst_api_service"             = 5001
@@ -105,8 +105,8 @@ variable "node_port_map" {
   default = {
     "mozart_service"          = 30001
     "grq2_service"            = 30002
-    "minio_service_api"       = 30007
-    "minio_service_interface" = 30008
+    # "minio_service_api"       = 30007
+    # "minio_service_interface" = 30008
     "hysds_ui_service"        = 30009
     "ades_wpst_api_service"   = 30011
     "grq2_es"                 = 30012
diff --git a/terraform-test/terraform_unity_sps_test.go b/terraform-test/terraform_unity_sps_test.go
index 55b44e3..f15a249 100644
--- a/terraform-test/terraform_unity_sps_test.go
+++ b/terraform-test/terraform_unity_sps_test.go
@@ -61,7 +61,7 @@ func TestTerraformUnity(t *testing.T) {
 	statusCode, _ = http_helper.HttpGet(t, ades_wpst_api_url, nil)
 	assert.Equal(t, statusCode, 200)
 
-	minio_url := fmt.Sprintf("http://%s:9001", loadBalancerHostnames["minio"])
-	statusCode, _ = http_helper.HttpGet(t, minio_url, nil)
-	assert.Equal(t, statusCode, 200)
+	// minio_url := fmt.Sprintf("http://%s:9001", loadBalancerHostnames["minio"])
+	// statusCode, _ = http_helper.HttpGet(t, minio_url, nil)
+	// assert.Equal(t, statusCode, 200)
 }
diff --git a/terraform-unity/variables.tf b/terraform-unity/variables.tf
index 280b5fe..a6b579f 100644
--- a/terraform-unity/variables.tf
+++ b/terraform-unity/variables.tf
@@ -35,11 +35,11 @@ variable "docker_images" {
     hysds_factotum = "ghcr.io/unity-sds/unity-sps-prototype/hysds-factotum:unity-v0.0.1"
     ades_wpst_api  = "ghcr.io/unity-sds/unity-sps-prototype/ades-wpst-api:unity-v0.0.1"
     logstash       = "docker.elastic.co/logstash/logstash:7.10.2"
-    minio          = "minio/minio:RELEASE.2022-03-17T06-34-49Z"
-    mc             = "minio/mc:RELEASE.2022-03-13T22-34-00Z"
-    rabbitmq       = "rabbitmq:3-management"
-    busybox        = "k8s.gcr.io/busybox"
-    redis          = "redis:latest"
+    # minio          = "minio/minio:RELEASE.2022-03-17T06-34-49Z"
+    # mc             = "minio/mc:RELEASE.2022-03-13T22-34-00Z"
+    rabbitmq = "rabbitmq:3-management"
+    busybox  = "k8s.gcr.io/busybox"
+    redis    = "redis:latest"
   }
 }
 
@@ -74,13 +74,13 @@ variable "service_port_map" {
     "rabbitmq_service_epmd"             = 4369
     "rabbitmq_service_listener"         = 5672
     "rabbitmq_service_cluster_rpc"      = 15672
-    "minio_service_api"                 = 9000
-    "minio_service_interface"           = 9001
-    "hysds_ui_service"                  = 3000
-    "redis_service"                     = 6379
-    "ades_wpst_api_service"             = 5001
-    "grq2_es"                           = 9201
-    "mozart_es"                         = 9200
+    # "minio_service_api"                 = 9000
+    # "minio_service_interface"           = 9001
+    "hysds_ui_service"      = 3000
+    "redis_service"         = 6379
+    "ades_wpst_api_service" = 5001
+    "grq2_es"               = 9201
+    "mozart_es"             = 9200
   }
 }
 
@@ -88,14 +88,14 @@ variable "node_port_map" {
   description = "value"
   type        = map(number)
   default = {
-    "mozart_service"          = 30001
-    "grq2_service"            = 30002
-    "minio_service_api"       = 30007
-    "minio_service_interface" = 30008
-    "hysds_ui_service"        = 30009
-    "ades_wpst_api_service"   = 30011
-    "grq2_es"                 = 30012
-    "mozart_es"               = 30013
+    "mozart_service" = 30001
+    "grq2_service"   = 30002
+    # "minio_service_api"       = 30007
+    # "minio_service_interface" = 30008
+    "hysds_ui_service"      = 30009
+    "ades_wpst_api_service" = 30011
+    "grq2_es"               = 30012
+    "mozart_es"             = 30013
   }
 }
 

From 87c78c451793c26cc02afbbadecda28fb5f9982c Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 07:49:04 -0800
Subject: [PATCH 02/13] feat: Remove S3

---
 .../terraform-unity-sps-hysds-cluster/s3.tf   | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/s3.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/s3.tf
index a25a726..a9fcb09 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/s3.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/s3.tf
@@ -1,28 +1,28 @@
-locals {
-  source_s3_directory = abspath("${path.module}/../../dev_data/SOURCE_S3/")
-}
+# locals {
+#   source_s3_directory = abspath("${path.module}/../../dev_data/SOURCE_S3/")
+# }
 
 
-resource "aws_s3_bucket" "s3_bucket" {
-  bucket        = "${var.project}-${var.venue}-${var.counter}-staging"
-  force_destroy = true
-  #   tags = {
-  #     Name        = "My bucket"
-  #     Environment = "Dev"
-  #   }
-}
-resource "aws_s3_bucket_acl" "s3_bucket_acl" {
-  bucket = aws_s3_bucket.s3_bucket.id
-  acl    = "private"
-}
+# resource "aws_s3_bucket" "s3_bucket" {
+#   bucket        = "${var.project}-${var.venue}-${var.counter}-staging"
+#   force_destroy = true
+#   #   tags = {
+#   #     Name        = "My bucket"
+#   #     Environment = "Dev"
+#   #   }
+# }
+# resource "aws_s3_bucket_acl" "s3_bucket_acl" {
+#   bucket = aws_s3_bucket.s3_bucket.id
+#   acl    = "private"
+# }
 
-resource "aws_s3_object" "source_files" {
-  for_each = fileset(local.source_s3_directory, "**/*.*")
-  bucket   = aws_s3_bucket.s3_bucket.id
-  key      = each.value
-  source   = "${local.source_s3_directory}/${each.value}"
-  etag     = filemd5("${local.source_s3_directory}/${each.value}")
-  depends_on = [
-    aws_s3_bucket_acl.s3_bucket_acl
-  ]
-}
+# resource "aws_s3_object" "source_files" {
+#   for_each = fileset(local.source_s3_directory, "**/*.*")
+#   bucket   = aws_s3_bucket.s3_bucket.id
+#   key      = each.value
+#   source   = "${local.source_s3_directory}/${each.value}"
+#   etag     = filemd5("${local.source_s3_directory}/${each.value}")
+#   depends_on = [
+#     aws_s3_bucket_acl.s3_bucket_acl
+#   ]
+# }

From cdb4a692428d09a33e247bfa7b70c5939daa7a65 Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 08:06:37 -0800
Subject: [PATCH 03/13] feat: Reduce ELBs

---
 .../api_gatway.tf                             | 70 +++++++++----------
 .../elastic.tf                                |  7 +-
 .../terraform-unity-sps-hysds-cluster/grq2.tf |  3 -
 .../hysds_ui.tf                               |  4 --
 .../mozart.tf                                 |  3 -
 .../outputs.tf                                | 12 ++--
 terraform-test/terraform_unity_sps_test.go    | 32 ++++-----
 7 files changed, 59 insertions(+), 72 deletions(-)

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/api_gatway.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/api_gatway.tf
index 8b67ebb..50d6d9d 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/api_gatway.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/api_gatway.tf
@@ -6,42 +6,42 @@ resource "aws_ssm_parameter" "update_ades_wpst_url_stage_variable_of_api_gateway
   depends_on = [kubernetes_service.ades-wpst-api-service]
 }
 
-resource "aws_ssm_parameter" "update_grq_es_url_stage_variable_of_api_gateway" {
-  name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/grq-es-url", var.project, var.venue, var.namespace, var.counter)
-  type       = "String"
-  value      = "${data.kubernetes_service.grq-es.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.grq2_es}"
-  overwrite  = true
-  depends_on = [data.kubernetes_service.grq-es]
-}
+# resource "aws_ssm_parameter" "update_grq_es_url_stage_variable_of_api_gateway" {
+#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/grq-es-url", var.project, var.venue, var.namespace, var.counter)
+#   type       = "String"
+#   value      = "${data.kubernetes_service.grq-es.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.grq2_es}"
+#   overwrite  = true
+#   depends_on = [data.kubernetes_service.grq-es]
+# }
 
-resource "aws_ssm_parameter" "update_grq_rest_api_url_stage_variable_of_api_gateway" {
-  name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/grq-rest-api-url", var.project, var.venue, var.namespace, var.counter)
-  type       = "String"
-  value      = "${kubernetes_service.grq2-service.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.grq2_service}"
-  overwrite  = true
-  depends_on = [kubernetes_service.grq2-service]
-}
+# resource "aws_ssm_parameter" "update_grq_rest_api_url_stage_variable_of_api_gateway" {
+#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/grq-rest-api-url", var.project, var.venue, var.namespace, var.counter)
+#   type       = "String"
+#   value      = "${kubernetes_service.grq2-service.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.grq2_service}"
+#   overwrite  = true
+#   depends_on = [kubernetes_service.grq2-service]
+# }
 
-resource "aws_ssm_parameter" "update_hysds_ui_url_stage_variable_of_api_gateway" {
-  name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/hysds-ui-url", var.project, var.venue, var.namespace, var.counter)
-  type       = "String"
-  value      = "${kubernetes_service.hysds-ui-service.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.hysds_ui_service}"
-  overwrite  = true
-  depends_on = [kubernetes_service.hysds-ui-service]
-}
+# resource "aws_ssm_parameter" "update_hysds_ui_url_stage_variable_of_api_gateway" {
+#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/hysds-ui-url", var.project, var.venue, var.namespace, var.counter)
+#   type       = "String"
+#   value      = "${kubernetes_service.hysds-ui-service.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.hysds_ui_service}"
+#   overwrite  = true
+#   depends_on = [kubernetes_service.hysds-ui-service]
+# }
 
-resource "aws_ssm_parameter" "update_mozart_es_url_stage_variable_of_api_gateway" {
-  name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/mozart-es-url", var.project, var.venue, var.namespace, var.counter)
-  type       = "String"
-  value      = "${data.kubernetes_service.mozart-es.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.mozart_es}"
-  overwrite  = true
-  depends_on = [data.kubernetes_service.mozart-es]
-}
+# resource "aws_ssm_parameter" "update_mozart_es_url_stage_variable_of_api_gateway" {
+#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/mozart-es-url", var.project, var.venue, var.namespace, var.counter)
+#   type       = "String"
+#   value      = "${data.kubernetes_service.mozart-es.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.mozart_es}"
+#   overwrite  = true
+#   depends_on = [data.kubernetes_service.mozart-es]
+# }
 
-resource "aws_ssm_parameter" "update_mozart_rest_api_url_stage_variable_of_api_gateway" {
-  name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/mozart-rest-api-url", var.project, var.venue, var.namespace, var.counter)
-  type       = "String"
-  value      = "${kubernetes_service.mozart-service.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.mozart_service}"
-  overwrite  = true
-  depends_on = [kubernetes_service.mozart-service]
-}
+# resource "aws_ssm_parameter" "update_mozart_rest_api_url_stage_variable_of_api_gateway" {
+#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/mozart-rest-api-url", var.project, var.venue, var.namespace, var.counter)
+#   type       = "String"
+#   value      = "${kubernetes_service.mozart-service.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.mozart_service}"
+#   overwrite  = true
+#   depends_on = [kubernetes_service.mozart-service]
+# }
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/elastic.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/elastic.tf
index 029297f..9db876e 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/elastic.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/elastic.tf
@@ -42,9 +42,7 @@ locals {
     clusterHealthCheckParams = "wait_for_status=yellow&timeout=1s"
     replicas                 = 1
     service = {
-      type     = var.service_type
-      port     = var.service_port_map.mozart_es
-      nodePort = var.service_type != "NodePort" ? null : var.node_port_map.mozart_es
+      port = var.service_port_map.mozart_es
     }
     httpPort      = var.service_port_map.mozart_es
     transportPort = 9300
@@ -131,8 +129,7 @@ locals {
     clusterHealthCheckParams = "wait_for_status=yellow&timeout=1s"
     replicas                 = 1
     service = {
-      type     = var.service_type
-      nodePort = var.service_type != "NodePort" ? null : var.node_port_map.grq2_es
+      port = var.service_port_map.grq2_es
     }
     httpPort      = var.service_port_map.grq2_es
     transportPort = 9301
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/grq2.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/grq2.tf
index 5dc9f22..f413837 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/grq2.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/grq2.tf
@@ -9,13 +9,10 @@ resource "kubernetes_service" "grq2-service" {
     selector = {
       app = "grq2"
     }
-    session_affinity = var.deployment_environment != "local" ? null : "ClientIP"
     port {
       port        = var.service_port_map.grq2_service
       target_port = 8878
-      node_port   = var.service_type != "NodePort" ? null : var.node_port_map.grq2_service
     }
-    type = var.service_type
   }
 }
 
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/hysds_ui.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/hysds_ui.tf
index 0fec271..54f72b7 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/hysds_ui.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/hysds_ui.tf
@@ -7,14 +7,10 @@ resource "kubernetes_service" "hysds-ui-service" {
     selector = {
       app = "hysds-ui"
     }
-    session_affinity = var.deployment_environment != "local" ? null : "ClientIP"
     port {
-      protocol    = "TCP"
       port        = var.service_port_map.hysds_ui_service
       target_port = 80
-      node_port   = var.service_type != "NodePort" ? null : var.node_port_map.hysds_ui_service
     }
-    type = var.service_type
   }
 }
 
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/mozart.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/mozart.tf
index a605255..2ca6d52 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/mozart.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/mozart.tf
@@ -8,13 +8,10 @@ resource "kubernetes_service" "mozart-service" {
     selector = {
       app = "mozart"
     }
-    session_affinity = var.deployment_environment != "local" ? null : "ClientIP"
     port {
       port        = var.service_port_map.mozart_service
       target_port = 8888
-      node_port   = var.service_type != "NodePort" ? null : var.node_port_map.mozart_service
     }
-    type = var.service_type
   }
 }
 
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
index d832497..428563d 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
@@ -18,12 +18,12 @@ data "kubernetes_service" "mozart-es" {
 output "load_balancer_hostnames" {
   description = "Load Balancer Ingress Hostnames"
   value = {
-    hysds_ui        = kubernetes_service.hysds-ui-service.status[0].load_balancer[0].ingress[0].hostname,
-    mozart_rest_api = kubernetes_service.mozart-service.status[0].load_balancer[0].ingress[0].hostname,
-    grq_rest_api    = kubernetes_service.grq2-service.status[0].load_balancer[0].ingress[0].hostname,
-    mozart_es       = data.kubernetes_service.mozart-es.status[0].load_balancer[0].ingress[0].hostname,
-    grq_es          = data.kubernetes_service.grq-es.status[0].load_balancer[0].ingress[0].hostname,
-    ades_wpst_api   = kubernetes_service.ades-wpst-api-service.status[0].load_balancer[0].ingress[0].hostname,
+    # hysds_ui        = kubernetes_service.hysds-ui-service.status[0].load_balancer[0].ingress[0].hostname,
+    # mozart_rest_api = kubernetes_service.mozart-service.status[0].load_balancer[0].ingress[0].hostname,
+    # grq_rest_api    = kubernetes_service.grq2-service.status[0].load_balancer[0].ingress[0].hostname,
+    # mozart_es       = data.kubernetes_service.mozart-es.status[0].load_balancer[0].ingress[0].hostname,
+    # grq_es          = data.kubernetes_service.grq-es.status[0].load_balancer[0].ingress[0].hostname,
+    ades_wpst_api = kubernetes_service.ades-wpst-api-service.status[0].load_balancer[0].ingress[0].hostname,
     # minio           = kubernetes_service.minio-service.status[0].load_balancer[0].ingress[0].hostname
   }
 }
diff --git a/terraform-test/terraform_unity_sps_test.go b/terraform-test/terraform_unity_sps_test.go
index f15a249..ceb3b85 100644
--- a/terraform-test/terraform_unity_sps_test.go
+++ b/terraform-test/terraform_unity_sps_test.go
@@ -37,28 +37,28 @@ func TestTerraformUnity(t *testing.T) {
 	loadBalancerHostnames := terraform.OutputMap(t, terraformOptions, "load_balancer_hostnames")
 
 	// Make an HTTP request to the instance and make sure we get back a 200 OK
-	hysds_ui_url := fmt.Sprintf("http://%s:3000", loadBalancerHostnames["hysds_ui"])
-	statusCode, _ := http_helper.HttpGet(t, hysds_ui_url, nil)
-	assert.Equal(t, statusCode, 200)
+	// hysds_ui_url := fmt.Sprintf("http://%s:3000", loadBalancerHostnames["hysds_ui"])
+	// statusCode, _ := http_helper.HttpGet(t, hysds_ui_url, nil)
+	// assert.Equal(t, statusCode, 200)
 
-	mozart_rest_api_url := fmt.Sprintf("http://%s:8888/api/v0.1/", loadBalancerHostnames["mozart_rest_api"])
-	statusCode, _ = http_helper.HttpGet(t, mozart_rest_api_url, nil)
-	assert.Equal(t, statusCode, 200)
+	// mozart_rest_api_url := fmt.Sprintf("http://%s:8888/api/v0.1/", loadBalancerHostnames["mozart_rest_api"])
+	// statusCode, _ = http_helper.HttpGet(t, mozart_rest_api_url, nil)
+	// assert.Equal(t, statusCode, 200)
 
-	mozart_es_url := fmt.Sprintf("http://%s:9200", loadBalancerHostnames["mozart_es"])
-	statusCode, _ = http_helper.HttpGet(t, mozart_es_url, nil)
-	assert.Equal(t, statusCode, 200)
+	// mozart_es_url := fmt.Sprintf("http://%s:9200", loadBalancerHostnames["mozart_es"])
+	// statusCode, _ = http_helper.HttpGet(t, mozart_es_url, nil)
+	// assert.Equal(t, statusCode, 200)
 
-	grq_rest_api_url := fmt.Sprintf("http://%s:8878/api/v0.1/", loadBalancerHostnames["grq_rest_api"])
-	statusCode, _ = http_helper.HttpGet(t, grq_rest_api_url, nil)
-	assert.Equal(t, statusCode, 200)
+	// grq_rest_api_url := fmt.Sprintf("http://%s:8878/api/v0.1/", loadBalancerHostnames["grq_rest_api"])
+	// statusCode, _ = http_helper.HttpGet(t, grq_rest_api_url, nil)
+	// assert.Equal(t, statusCode, 200)
 
-	grq_es_url := fmt.Sprintf("http://%s:9201", loadBalancerHostnames["grq_es"])
-	statusCode, _ = http_helper.HttpGet(t, grq_es_url, nil)
-	assert.Equal(t, statusCode, 200)
+	// grq_es_url := fmt.Sprintf("http://%s:9201", loadBalancerHostnames["grq_es"])
+	// statusCode, _ = http_helper.HttpGet(t, grq_es_url, nil)
+	// assert.Equal(t, statusCode, 200)
 
 	ades_wpst_api_url := fmt.Sprintf("http://%s:5001/api/docs", loadBalancerHostnames["ades_wpst_api"])
-	statusCode, _ = http_helper.HttpGet(t, ades_wpst_api_url, nil)
+	statusCode, _ := http_helper.HttpGet(t, ades_wpst_api_url, nil)
 	assert.Equal(t, statusCode, 200)
 
 	// minio_url := fmt.Sprintf("http://%s:9001", loadBalancerHostnames["minio"])

From e098690ddbea9ce7961d81a3b04caaf89ea83e90 Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 09:00:51 -0800
Subject: [PATCH 04/13] chore: replace deprecated template_file with
 templatefile

---
 .../configs.tf                                | 143 +++++++++++-------
 .../factotum.tf                               |  24 +--
 .../verdi.tf                                  |  26 ++--
 3 files changed, 111 insertions(+), 82 deletions(-)

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
index 2a400ab..14e1b0e 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
@@ -1,60 +1,83 @@
-data "template_file" "mozart-settings" {
-  template = file("${path.module}/../../hysds/mozart/rest_api/settings.cfg")
-  vars = {
-    rabbitmq_admin_port = var.service_port_map.rabbitmq_mgmt_service_cluster_rpc
-    mozart_service_port = var.service_port_map.mozart_service
-    mozart_es_port      = var.service_port_map.mozart_es
-  }
-}
+# data "template_file" "mozart-settings" {
+#   template = file("${path.module}/../../hysds/mozart/rest_api/settings.cfg")
+#   vars = {
+#     rabbitmq_admin_port = var.service_port_map.rabbitmq_mgmt_service_cluster_rpc
+#     mozart_service_port = var.service_port_map.mozart_service
+#     mozart_es_port      = var.service_port_map.mozart_es
+#   }
+# }
 
 resource "kubernetes_config_map" "mozart-settings" {
   metadata {
     name      = "mozart-settings"
     namespace = kubernetes_namespace.unity-sps.metadata[0].name
   }
+  # data = {
+  #   "settings.cfg" = "${chomp(data.template_file.mozart-settings.rendered)}"
+  # }
   data = {
-    "settings.cfg" = "${chomp(data.template_file.mozart-settings.rendered)}"
+    "settings.cfg" = "${chomp(templatefile("${path.module}/../../hysds/mozart/rest_api/settings.cfg", {
+      rabbitmq_admin_port = var.service_port_map.rabbitmq_mgmt_service_cluster_rpc
+      mozart_service_port = var.service_port_map.mozart_service
+      mozart_es_port      = var.service_port_map.mozart_es
+    }))}"
   }
 }
 
-data "template_file" "grq2-settings" {
-  template = file("${path.module}/../../hysds/grq/rest_api/settings.cfg")
-  vars = {
-    mozart_es_port     = var.service_port_map.mozart_es
-    redis_service_port = var.service_port_map.redis_service
-    grq2_es_port       = var.service_port_map.grq2_es
-  }
-}
+# data "template_file" "grq2-settings" {
+#   template = file("${path.module}/../../hysds/grq/rest_api/settings.cfg")
+#   vars = {
+#     mozart_es_port     = var.service_port_map.mozart_es
+#     redis_service_port = var.service_port_map.redis_service
+#     grq2_es_port       = var.service_port_map.grq2_es
+#   }
+# }
 
 resource "kubernetes_config_map" "grq2-settings" {
   metadata {
     name      = "grq2-settings"
     namespace = kubernetes_namespace.unity-sps.metadata[0].name
   }
+  # data = {
+  #   "settings.cfg" = "${chomp(data.template_file.grq2-settings.rendered)}"
+  # }
   data = {
-    "settings.cfg" = "${chomp(data.template_file.grq2-settings.rendered)}"
-  }
+      "settings.cfg" = "${chomp(templatefile("${path.module}/../../hysds/grq/rest_api/settings.cfg", {
+        mozart_es_port     = var.service_port_map.mozart_es
+        redis_service_port = var.service_port_map.redis_service
+        grq2_es_port       = var.service_port_map.grq2_es
+      }))}"
 }
 
-data "template_file" "celeryconfig" {
-  template = file("${path.module}/../../hysds/configs/${var.celeryconfig_filename}")
-  vars = {
-    rabbitmq_service_port = var.service_port_map.rabbitmq_service_listener
-    redis_service_port    = var.service_port_map.redis_service
-    mozart_service_port   = var.service_port_map.mozart_service
-    mozart_es_port        = var.service_port_map.mozart_es
-    grq2_service_port     = var.service_port_map.grq2_service
-    grq2_es_port          = var.service_port_map.grq2_es
-  }
-}
+# data "template_file" "celeryconfig" {
+#   template = file("${path.module}/../../hysds/configs/${var.celeryconfig_filename}")
+#   vars = {
+#     rabbitmq_service_port = var.service_port_map.rabbitmq_service_listener
+#     redis_service_port    = var.service_port_map.redis_service
+#     mozart_service_port   = var.service_port_map.mozart_service
+#     mozart_es_port        = var.service_port_map.mozart_es
+#     grq2_service_port     = var.service_port_map.grq2_service
+#     grq2_es_port          = var.service_port_map.grq2_es
+#   }
+# }
 
 resource "kubernetes_config_map" "celeryconfig" {
   metadata {
     name      = "celeryconfig"
     namespace = kubernetes_namespace.unity-sps.metadata[0].name
   }
+  # data = {
+  #   "celeryconfig.py" = "${chomp(data.template_file.celeryconfig.rendered)}"
+  # }
   data = {
-    "celeryconfig.py" = "${chomp(data.template_file.celeryconfig.rendered)}"
+    "celeryconfig.py" = "${chomp("${chomp(templatefile("${path.module}/../../hysds/configs/${var.celeryconfig_filename}", {
+      rabbitmq_service_port = var.service_port_map.rabbitmq_service_listener
+      redis_service_port    = var.service_port_map.redis_service
+      mozart_service_port   = var.service_port_map.mozart_service
+      mozart_es_port        = var.service_port_map.mozart_es
+      grq2_service_port     = var.service_port_map.grq2_service
+      grq2_es_port          = var.service_port_map.grq2_es
+    }))}")}"
   }
 }
 
@@ -68,19 +91,19 @@ resource "kubernetes_config_map" "netrc" {
   }
 }
 
-data "template_file" "logstash-conf" {
-  template = file("${path.module}/../../hysds/mozart/logstash/logstash.conf")
-  vars = {
-    mozart_es_port = var.service_port_map.mozart_es
-  }
-}
+# data "template_file" "logstash-conf" {
+#   template = file("${path.module}/../../hysds/mozart/logstash/logstash.conf")
+#   vars = {
+#     mozart_es_port = var.service_port_map.mozart_es
+#   }
+# }
 
-data "template_file" "logstash-yml" {
-  template = file("${path.module}/../../hysds/mozart/logstash/logstash.yml")
-  vars = {
-    mozart_es_port = var.service_port_map.mozart_es
-  }
-}
+# data "template_file" "logstash-yml" {
+#   template = file("${path.module}/../../hysds/mozart/logstash/logstash.yml")
+#   vars = {
+#     mozart_es_port = var.service_port_map.mozart_es
+#   }
+# }
 
 resource "kubernetes_config_map" "logstash-configs" {
   metadata {
@@ -92,8 +115,14 @@ resource "kubernetes_config_map" "logstash-configs" {
     "event-status"  = "${file("${path.module}/../../hysds/mozart/logstash/event_status.template.json")}"
     "worker-status" = "${file("${path.module}/../../hysds/mozart/logstash/worker_status.template.json")}"
     "task-status"   = "${file("${path.module}/../../hysds/mozart/logstash/task_status.template.json")}"
-    "logstash-conf" = "${chomp(data.template_file.logstash-conf.rendered)}"
-    "logstash-yml"  = "${chomp(data.template_file.logstash-yml.rendered)}"
+    # "logstash-conf" = "${chomp(data.template_file.logstash-conf.rendered)}"
+    # "logstash-yml"  = "${chomp(data.template_file.logstash-yml.rendered)}"
+    "logstash-conf" = "${chomp(templatefile("${path.module}/../../hysds/mozart/logstash/logstash.conf", {
+      mozart_es_port = var.service_port_map.mozart_es
+    }))}"
+    "logstash-yml"  = "${chomp(templatefile("${path.module}/../../hysds/mozart/logstash/logstash.yml", {
+      mozart_es_port = var.service_port_map.mozart_es
+    }))}"
   }
 }
 
@@ -179,18 +208,18 @@ resource "kubernetes_config_map" "supervisord-orchestrator" {
 #   }
 # }
 
-resource "kubernetes_config_map" "datasets" {
-  metadata {
-    name      = "datasets"
-    namespace = kubernetes_namespace.unity-sps.metadata[0].name
-  }
-  # TODO - Using this template file is temporary. A more sophisticated method for generating
-  # custom config files will be added in the future. This could take the form of a Terraform
-  # resource that generates all the custom config files.
-  data = {
-    "datasets.json" = "${chomp(data.template_file.datasets.rendered)}"
-  }
-}
+# resource "kubernetes_config_map" "datasets" {
+#   metadata {
+#     name      = "datasets"
+#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
+#   }
+#   # TODO - Using this template file is temporary. A more sophisticated method for generating
+#   # custom config files will be added in the future. This could take the form of a Terraform
+#   # resource that generates all the custom config files.
+#   data = {
+#     "datasets.json" = "${chomp(data.template_file.datasets.rendered)}"
+#   }
+# }
 
 resource "kubernetes_config_map" "supervisord-job-worker" {
   metadata {
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/factotum.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/factotum.tf
index f23156e..361bc95 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/factotum.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/factotum.tf
@@ -118,12 +118,12 @@ resource "kubernetes_deployment" "factotum-job-worker" {
             read_only  = false
           }
 
-          volume_mount {
-            name       = kubernetes_config_map.datasets.metadata[0].name
-            mount_path = "/home/ops/datasets.json"
-            sub_path   = "datasets.json"
-            read_only  = false
-          }
+          # volume_mount {
+          #   name       = kubernetes_config_map.datasets.metadata[0].name
+          #   mount_path = "/home/ops/datasets.json"
+          #   sub_path   = "datasets.json"
+          #   read_only  = false
+          # }
 
           volume_mount {
             name       = kubernetes_config_map.supervisord-job-worker.metadata[0].name
@@ -151,12 +151,12 @@ resource "kubernetes_deployment" "factotum-job-worker" {
           }
         }
 
-        volume {
-          name = kubernetes_config_map.datasets.metadata[0].name
-          config_map {
-            name = kubernetes_config_map.datasets.metadata[0].name
-          }
-        }
+        # volume {
+        #   name = kubernetes_config_map.datasets.metadata[0].name
+        #   config_map {
+        #     name = kubernetes_config_map.datasets.metadata[0].name
+        #   }
+        # }
 
         volume {
           name = kubernetes_config_map.supervisord-job-worker.metadata[0].name
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
index 0538966..9e42c4d 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
@@ -133,12 +133,12 @@ resource "kubernetes_deployment" "verdi" {
             sub_path   = "celeryconfig.py"
             read_only  = false
           }
-          volume_mount {
-            name       = kubernetes_config_map.datasets.metadata[0].name
-            mount_path = "/home/ops/datasets.json"
-            sub_path   = "datasets.json"
-            read_only  = false
-          }
+          # volume_mount {
+          #   name       = kubernetes_config_map.datasets.metadata[0].name
+          #   mount_path = "/home/ops/datasets.json"
+          #   sub_path   = "datasets.json"
+          #   read_only  = false
+          # }
 
           volume_mount {
             name       = kubernetes_config_map.supervisord-verdi.metadata[0].name
@@ -185,13 +185,13 @@ resource "kubernetes_deployment" "verdi" {
             name = kubernetes_config_map.celeryconfig.metadata[0].name
           }
         }
-        volume {
-          name = kubernetes_config_map.datasets.metadata[0].name
-          config_map {
-            name = kubernetes_config_map.datasets.metadata[0].name
-          }
-        }
-        volume {
+        # volume {
+        #   name = kubernetes_config_map.datasets.metadata[0].name
+        #   config_map {
+        #     name = kubernetes_config_map.datasets.metadata[0].name
+        #   }
+        # }
+        # volume {
           name = kubernetes_config_map.supervisord-verdi.metadata[0].name
           config_map {
             name = kubernetes_config_map.supervisord-verdi.metadata[0].name

From 7ce5d3bb2fb1960c2d3321527aad2371781804d3 Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 09:06:49 -0800
Subject: [PATCH 05/13] chore: Fix typos

---
 .../terraform-unity-sps-hysds-cluster/configs.tf    | 13 +++++++------
 .../terraform-unity-sps-hysds-cluster/verdi.tf      |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
index 14e1b0e..b46f91d 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
@@ -42,11 +42,12 @@ resource "kubernetes_config_map" "grq2-settings" {
   #   "settings.cfg" = "${chomp(data.template_file.grq2-settings.rendered)}"
   # }
   data = {
-      "settings.cfg" = "${chomp(templatefile("${path.module}/../../hysds/grq/rest_api/settings.cfg", {
-        mozart_es_port     = var.service_port_map.mozart_es
-        redis_service_port = var.service_port_map.redis_service
-        grq2_es_port       = var.service_port_map.grq2_es
-      }))}"
+    "settings.cfg" = "${chomp(templatefile("${path.module}/../../hysds/grq/rest_api/settings.cfg", {
+      mozart_es_port     = var.service_port_map.mozart_es
+      redis_service_port = var.service_port_map.redis_service
+      grq2_es_port       = var.service_port_map.grq2_es
+    }))}"
+  }
 }
 
 # data "template_file" "celeryconfig" {
@@ -120,7 +121,7 @@ resource "kubernetes_config_map" "logstash-configs" {
     "logstash-conf" = "${chomp(templatefile("${path.module}/../../hysds/mozart/logstash/logstash.conf", {
       mozart_es_port = var.service_port_map.mozart_es
     }))}"
-    "logstash-yml"  = "${chomp(templatefile("${path.module}/../../hysds/mozart/logstash/logstash.yml", {
+    "logstash-yml" = "${chomp(templatefile("${path.module}/../../hysds/mozart/logstash/logstash.yml", {
       mozart_es_port = var.service_port_map.mozart_es
     }))}"
   }
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
index 9e42c4d..cdc96ae 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
@@ -191,7 +191,7 @@ resource "kubernetes_deployment" "verdi" {
         #     name = kubernetes_config_map.datasets.metadata[0].name
         #   }
         # }
-        # volume {
+        volume {
           name = kubernetes_config_map.supervisord-verdi.metadata[0].name
           config_map {
             name = kubernetes_config_map.supervisord-verdi.metadata[0].name

From 9d45132cb3ac1de56513ea43eff1977f8ba0ffdb Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 10:24:41 -0800
Subject: [PATCH 06/13] chore: Add datasets.json back

---
 .terraform-version                            |  2 +-
 .../configs.tf                                | 28 +++++++++----------
 .../factotum.tf                               | 24 ++++++++--------
 .../verdi.tf                                  | 24 ++++++++--------
 .../versions.tf                               |  6 +---
 terraform-unity/.terraform.lock.hcl           |  9 ++++--
 6 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/.terraform-version b/.terraform-version
index 512a1fa..95b25ae 100644
--- a/.terraform-version
+++ b/.terraform-version
@@ -1 +1 @@
-1.1.9
+1.3.6
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
index b46f91d..677e700 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
@@ -71,14 +71,14 @@ resource "kubernetes_config_map" "celeryconfig" {
   #   "celeryconfig.py" = "${chomp(data.template_file.celeryconfig.rendered)}"
   # }
   data = {
-    "celeryconfig.py" = "${chomp("${chomp(templatefile("${path.module}/../../hysds/configs/${var.celeryconfig_filename}", {
+    "celeryconfig.py" = "${chomp(templatefile("${path.module}/../../hysds/configs/${var.celeryconfig_filename}", {
       rabbitmq_service_port = var.service_port_map.rabbitmq_service_listener
       redis_service_port    = var.service_port_map.redis_service
       mozart_service_port   = var.service_port_map.mozart_service
       mozart_es_port        = var.service_port_map.mozart_es
       grq2_service_port     = var.service_port_map.grq2_service
       grq2_es_port          = var.service_port_map.grq2_es
-    }))}")}"
+    }))}"
   }
 }
 
@@ -209,18 +209,18 @@ resource "kubernetes_config_map" "supervisord-orchestrator" {
 #   }
 # }
 
-# resource "kubernetes_config_map" "datasets" {
-#   metadata {
-#     name      = "datasets"
-#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
-#   }
-#   # TODO - Using this template file is temporary. A more sophisticated method for generating
-#   # custom config files will be added in the future. This could take the form of a Terraform
-#   # resource that generates all the custom config files.
-#   data = {
-#     "datasets.json" = "${chomp(data.template_file.datasets.rendered)}"
-#   }
-# }
+resource "kubernetes_config_map" "datasets" {
+  metadata {
+    name      = "datasets"
+    namespace = kubernetes_namespace.unity-sps.metadata[0].name
+  }
+  # TODO - Using this template file is temporary. A more sophisticated method for generating
+  # custom config files will be added in the future. This could take the form of a Terraform
+  # resource that generates all the custom config files.
+  data = {
+    "datasets.json" = "${file("${path.module}/../../hysds/configs/${var.datasets_filename}")}"
+  }
+}
 
 resource "kubernetes_config_map" "supervisord-job-worker" {
   metadata {
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/factotum.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/factotum.tf
index 361bc95..f23156e 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/factotum.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/factotum.tf
@@ -118,12 +118,12 @@ resource "kubernetes_deployment" "factotum-job-worker" {
             read_only  = false
           }
 
-          # volume_mount {
-          #   name       = kubernetes_config_map.datasets.metadata[0].name
-          #   mount_path = "/home/ops/datasets.json"
-          #   sub_path   = "datasets.json"
-          #   read_only  = false
-          # }
+          volume_mount {
+            name       = kubernetes_config_map.datasets.metadata[0].name
+            mount_path = "/home/ops/datasets.json"
+            sub_path   = "datasets.json"
+            read_only  = false
+          }
 
           volume_mount {
             name       = kubernetes_config_map.supervisord-job-worker.metadata[0].name
@@ -151,12 +151,12 @@ resource "kubernetes_deployment" "factotum-job-worker" {
           }
         }
 
-        # volume {
-        #   name = kubernetes_config_map.datasets.metadata[0].name
-        #   config_map {
-        #     name = kubernetes_config_map.datasets.metadata[0].name
-        #   }
-        # }
+        volume {
+          name = kubernetes_config_map.datasets.metadata[0].name
+          config_map {
+            name = kubernetes_config_map.datasets.metadata[0].name
+          }
+        }
 
         volume {
           name = kubernetes_config_map.supervisord-job-worker.metadata[0].name
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
index cdc96ae..0538966 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
@@ -133,12 +133,12 @@ resource "kubernetes_deployment" "verdi" {
             sub_path   = "celeryconfig.py"
             read_only  = false
           }
-          # volume_mount {
-          #   name       = kubernetes_config_map.datasets.metadata[0].name
-          #   mount_path = "/home/ops/datasets.json"
-          #   sub_path   = "datasets.json"
-          #   read_only  = false
-          # }
+          volume_mount {
+            name       = kubernetes_config_map.datasets.metadata[0].name
+            mount_path = "/home/ops/datasets.json"
+            sub_path   = "datasets.json"
+            read_only  = false
+          }
 
           volume_mount {
             name       = kubernetes_config_map.supervisord-verdi.metadata[0].name
@@ -185,12 +185,12 @@ resource "kubernetes_deployment" "verdi" {
             name = kubernetes_config_map.celeryconfig.metadata[0].name
           }
         }
-        # volume {
-        #   name = kubernetes_config_map.datasets.metadata[0].name
-        #   config_map {
-        #     name = kubernetes_config_map.datasets.metadata[0].name
-        #   }
-        # }
+        volume {
+          name = kubernetes_config_map.datasets.metadata[0].name
+          config_map {
+            name = kubernetes_config_map.datasets.metadata[0].name
+          }
+        }
         volume {
           name = kubernetes_config_map.supervisord-verdi.metadata[0].name
           config_map {
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/versions.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/versions.tf
index f19501d..8b227e7 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/versions.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.1.8"
+  required_version = ">= 1.3.6"
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"
@@ -17,9 +17,5 @@ terraform {
       source  = "hashicorp/null"
       version = "3.1.1"
     }
-    template = {
-      source  = "hashicorp/template"
-      version = "2.2.0"
-    }
   }
 }
diff --git a/terraform-unity/.terraform.lock.hcl b/terraform-unity/.terraform.lock.hcl
index da8ef58..3e4599c 100644
--- a/terraform-unity/.terraform.lock.hcl
+++ b/terraform-unity/.terraform.lock.hcl
@@ -22,7 +22,8 @@ provider "registry.terraform.io/hashicorp/aws" {
 }
 
 provider "registry.terraform.io/hashicorp/helm" {
-  version = "2.6.0"
+  version     = "2.6.0"
+  constraints = "2.6.0"
   hashes = [
     "h1:i+fbwv8Vk8n5kQc+spEtzvCNF4yo2exzSAZhL0ipFuo=",
     "zh:0ac248c28acc1a4fd11bd26a85e48ab78dd6abf0f7ac842bf1cd7edd05ac6cf8",
@@ -41,7 +42,8 @@ provider "registry.terraform.io/hashicorp/helm" {
 }
 
 provider "registry.terraform.io/hashicorp/kubernetes" {
-  version = "2.12.1"
+  version     = "2.12.1"
+  constraints = "2.12.1"
   hashes = [
     "h1:YdDA370JByM9HT5GdLpt34z3BvcVW4BnVXqdgB/vZ6I=",
     "zh:1ecb2adff52754fb4680c7cfe6143d1d8c264b00bb0c44f07f5583b1c7f978b8",
@@ -60,7 +62,8 @@ provider "registry.terraform.io/hashicorp/kubernetes" {
 }
 
 provider "registry.terraform.io/hashicorp/null" {
-  version = "3.1.1"
+  version     = "3.1.1"
+  constraints = "3.1.1"
   hashes = [
     "h1:YvH6gTaQzGdNv+SKTZujU1O0bO+Pw6vJHOPhqgN8XNs=",
     "zh:063466f41f1d9fd0dd93722840c1314f046d8760b1812fa67c34de0afcba5597",

From 8f576a4e848988c8580e883270ed9003935ce26e Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 10:26:23 -0800
Subject: [PATCH 07/13] chore: remove ES services from TF output

---
 .../outputs.tf                                | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
index 428563d..5f6a388 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
@@ -1,16 +1,16 @@
-data "kubernetes_service" "grq-es" {
-  metadata {
-    namespace = kubernetes_namespace.unity-sps.metadata[0].name
-    name      = jsondecode(helm_release.grq2-es.metadata[0].values).masterService
-  }
-}
+# data "kubernetes_service" "grq-es" {
+#   metadata {
+#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
+#     name      = jsondecode(helm_release.grq2-es.metadata[0].values).masterService
+#   }
+# }
 
-data "kubernetes_service" "mozart-es" {
-  metadata {
-    namespace = kubernetes_namespace.unity-sps.metadata[0].name
-    name      = jsondecode(helm_release.mozart-es.metadata[0].values).masterService
-  }
-}
+# data "kubernetes_service" "mozart-es" {
+#   metadata {
+#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
+#     name      = jsondecode(helm_release.mozart-es.metadata[0].values).masterService
+#   }
+# }
 
 # https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/ingress
 # https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-to-elb-load-balancer.html

From 1e398824c53697195e4ff54c5d7f8bc381488b84 Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 10:29:13 -0800
Subject: [PATCH 08/13] chore: Fix TF formatting

---
 .../variables.tf                              | 22 ++++++++---------
 terraform-unity/variables.tf                  | 24 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf
index f9b2286..3135db4 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf
@@ -37,11 +37,11 @@ variable "docker_images" {
     hysds_factotum = "ghcr.io/unity-sds/unity-sps-prototype/hysds-factotum:unity-v0.0.1"
     ades_wpst_api  = "ghcr.io/unity-sds/unity-sps-prototype/ades-wpst-api:unity-v0.0.1"
     logstash       = "docker.elastic.co/logstash/logstash:7.10.2"
+    rabbitmq       = "rabbitmq:3-management"
+    busybox        = "k8s.gcr.io/busybox"
+    redis          = "redis:latest"
     # minio          = "minio/minio:RELEASE.2022-03-17T06-34-49Z"
     # mc             = "minio/mc:RELEASE.2022-03-13T22-34-00Z"
-    rabbitmq = "rabbitmq:3-management"
-    busybox  = "k8s.gcr.io/busybox"
-    redis    = "redis:latest"
   }
 }
 
@@ -89,13 +89,13 @@ variable "service_port_map" {
     "rabbitmq_service_epmd"             = 4369
     "rabbitmq_service_listener"         = 5672
     "rabbitmq_service_cluster_rpc"      = 15672
-    # "minio_service_api"                 = 9000
-    # "minio_service_interface"           = 9001
     "hysds_ui_service"                  = 3000
     "redis_service"                     = 6379
     "ades_wpst_api_service"             = 5001
     "grq2_es"                           = 9201
     "mozart_es"                         = 9200
+    # "minio_service_api"                 = 9000
+    # "minio_service_interface"           = 9001
   }
 }
 
@@ -103,14 +103,14 @@ variable "node_port_map" {
   description = "value"
   type        = map(number)
   default = {
-    "mozart_service"          = 30001
-    "grq2_service"            = 30002
+    "mozart_service"        = 30001
+    "grq2_service"          = 30002
+    "hysds_ui_service"      = 30009
+    "ades_wpst_api_service" = 30011
+    "grq2_es"               = 30012
+    "mozart_es"             = 30013
     # "minio_service_api"       = 30007
     # "minio_service_interface" = 30008
-    "hysds_ui_service"        = 30009
-    "ades_wpst_api_service"   = 30011
-    "grq2_es"                 = 30012
-    "mozart_es"               = 30013
   }
 }
 
diff --git a/terraform-unity/variables.tf b/terraform-unity/variables.tf
index a6b579f..98221d3 100644
--- a/terraform-unity/variables.tf
+++ b/terraform-unity/variables.tf
@@ -35,11 +35,11 @@ variable "docker_images" {
     hysds_factotum = "ghcr.io/unity-sds/unity-sps-prototype/hysds-factotum:unity-v0.0.1"
     ades_wpst_api  = "ghcr.io/unity-sds/unity-sps-prototype/ades-wpst-api:unity-v0.0.1"
     logstash       = "docker.elastic.co/logstash/logstash:7.10.2"
+    rabbitmq       = "rabbitmq:3-management"
+    busybox        = "k8s.gcr.io/busybox"
+    redis          = "redis:latest"
     # minio          = "minio/minio:RELEASE.2022-03-17T06-34-49Z"
     # mc             = "minio/mc:RELEASE.2022-03-13T22-34-00Z"
-    rabbitmq = "rabbitmq:3-management"
-    busybox  = "k8s.gcr.io/busybox"
-    redis    = "redis:latest"
   }
 }
 
@@ -74,13 +74,13 @@ variable "service_port_map" {
     "rabbitmq_service_epmd"             = 4369
     "rabbitmq_service_listener"         = 5672
     "rabbitmq_service_cluster_rpc"      = 15672
+    "hysds_ui_service"                  = 3000
+    "redis_service"                     = 6379
+    "ades_wpst_api_service"             = 5001
+    "grq2_es"                           = 9201
+    "mozart_es"                         = 9200
     # "minio_service_api"                 = 9000
     # "minio_service_interface"           = 9001
-    "hysds_ui_service"      = 3000
-    "redis_service"         = 6379
-    "ades_wpst_api_service" = 5001
-    "grq2_es"               = 9201
-    "mozart_es"             = 9200
   }
 }
 
@@ -88,14 +88,14 @@ variable "node_port_map" {
   description = "value"
   type        = map(number)
   default = {
-    "mozart_service" = 30001
-    "grq2_service"   = 30002
-    # "minio_service_api"       = 30007
-    # "minio_service_interface" = 30008
+    "mozart_service"        = 30001
+    "grq2_service"          = 30002
     "hysds_ui_service"      = 30009
     "ades_wpst_api_service" = 30011
     "grq2_es"               = 30012
     "mozart_es"             = 30013
+    # "minio_service_api"       = 30007
+    # "minio_service_interface" = 30008
   }
 }
 

From dcc6518644c4e1f27d523db7d548f530e79c7134 Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 10:38:28 -0800
Subject: [PATCH 09/13] chore: removed commented sections of TF

---
 .../api_gatway.tf                             |  40 ---
 .../configs.tf                                |  63 -----
 .../minio.tf                                  | 229 ------------------
 .../outputs.tf                                |  20 --
 .../terraform-unity-sps-hysds-cluster/s3.tf   |  28 ---
 .../variables.tf                              |   6 -
 terraform-test/terraform_unity_sps_test.go    |  25 --
 terraform-unity/variables.tf                  |   6 -
 8 files changed, 417 deletions(-)
 delete mode 100644 terraform-modules/terraform-unity-sps-hysds-cluster/minio.tf
 delete mode 100644 terraform-modules/terraform-unity-sps-hysds-cluster/s3.tf

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/api_gatway.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/api_gatway.tf
index 50d6d9d..3865abc 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/api_gatway.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/api_gatway.tf
@@ -5,43 +5,3 @@ resource "aws_ssm_parameter" "update_ades_wpst_url_stage_variable_of_api_gateway
   overwrite  = true
   depends_on = [kubernetes_service.ades-wpst-api-service]
 }
-
-# resource "aws_ssm_parameter" "update_grq_es_url_stage_variable_of_api_gateway" {
-#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/grq-es-url", var.project, var.venue, var.namespace, var.counter)
-#   type       = "String"
-#   value      = "${data.kubernetes_service.grq-es.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.grq2_es}"
-#   overwrite  = true
-#   depends_on = [data.kubernetes_service.grq-es]
-# }
-
-# resource "aws_ssm_parameter" "update_grq_rest_api_url_stage_variable_of_api_gateway" {
-#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/grq-rest-api-url", var.project, var.venue, var.namespace, var.counter)
-#   type       = "String"
-#   value      = "${kubernetes_service.grq2-service.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.grq2_service}"
-#   overwrite  = true
-#   depends_on = [kubernetes_service.grq2-service]
-# }
-
-# resource "aws_ssm_parameter" "update_hysds_ui_url_stage_variable_of_api_gateway" {
-#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/hysds-ui-url", var.project, var.venue, var.namespace, var.counter)
-#   type       = "String"
-#   value      = "${kubernetes_service.hysds-ui-service.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.hysds_ui_service}"
-#   overwrite  = true
-#   depends_on = [kubernetes_service.hysds-ui-service]
-# }
-
-# resource "aws_ssm_parameter" "update_mozart_es_url_stage_variable_of_api_gateway" {
-#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/mozart-es-url", var.project, var.venue, var.namespace, var.counter)
-#   type       = "String"
-#   value      = "${data.kubernetes_service.mozart-es.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.mozart_es}"
-#   overwrite  = true
-#   depends_on = [data.kubernetes_service.mozart-es]
-# }
-
-# resource "aws_ssm_parameter" "update_mozart_rest_api_url_stage_variable_of_api_gateway" {
-#   name       = format("/%s/%s/%s-%s/api-gateway/stage-variables/mozart-rest-api-url", var.project, var.venue, var.namespace, var.counter)
-#   type       = "String"
-#   value      = "${kubernetes_service.mozart-service.status[0].load_balancer[0].ingress[0].hostname}:${var.service_port_map.mozart_service}"
-#   overwrite  = true
-#   depends_on = [kubernetes_service.mozart-service]
-# }
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
index 677e700..53c6fb8 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
@@ -1,20 +1,8 @@
-# data "template_file" "mozart-settings" {
-#   template = file("${path.module}/../../hysds/mozart/rest_api/settings.cfg")
-#   vars = {
-#     rabbitmq_admin_port = var.service_port_map.rabbitmq_mgmt_service_cluster_rpc
-#     mozart_service_port = var.service_port_map.mozart_service
-#     mozart_es_port      = var.service_port_map.mozart_es
-#   }
-# }
-
 resource "kubernetes_config_map" "mozart-settings" {
   metadata {
     name      = "mozart-settings"
     namespace = kubernetes_namespace.unity-sps.metadata[0].name
   }
-  # data = {
-  #   "settings.cfg" = "${chomp(data.template_file.mozart-settings.rendered)}"
-  # }
   data = {
     "settings.cfg" = "${chomp(templatefile("${path.module}/../../hysds/mozart/rest_api/settings.cfg", {
       rabbitmq_admin_port = var.service_port_map.rabbitmq_mgmt_service_cluster_rpc
@@ -24,23 +12,11 @@ resource "kubernetes_config_map" "mozart-settings" {
   }
 }
 
-# data "template_file" "grq2-settings" {
-#   template = file("${path.module}/../../hysds/grq/rest_api/settings.cfg")
-#   vars = {
-#     mozart_es_port     = var.service_port_map.mozart_es
-#     redis_service_port = var.service_port_map.redis_service
-#     grq2_es_port       = var.service_port_map.grq2_es
-#   }
-# }
-
 resource "kubernetes_config_map" "grq2-settings" {
   metadata {
     name      = "grq2-settings"
     namespace = kubernetes_namespace.unity-sps.metadata[0].name
   }
-  # data = {
-  #   "settings.cfg" = "${chomp(data.template_file.grq2-settings.rendered)}"
-  # }
   data = {
     "settings.cfg" = "${chomp(templatefile("${path.module}/../../hysds/grq/rest_api/settings.cfg", {
       mozart_es_port     = var.service_port_map.mozart_es
@@ -50,26 +26,11 @@ resource "kubernetes_config_map" "grq2-settings" {
   }
 }
 
-# data "template_file" "celeryconfig" {
-#   template = file("${path.module}/../../hysds/configs/${var.celeryconfig_filename}")
-#   vars = {
-#     rabbitmq_service_port = var.service_port_map.rabbitmq_service_listener
-#     redis_service_port    = var.service_port_map.redis_service
-#     mozart_service_port   = var.service_port_map.mozart_service
-#     mozart_es_port        = var.service_port_map.mozart_es
-#     grq2_service_port     = var.service_port_map.grq2_service
-#     grq2_es_port          = var.service_port_map.grq2_es
-#   }
-# }
-
 resource "kubernetes_config_map" "celeryconfig" {
   metadata {
     name      = "celeryconfig"
     namespace = kubernetes_namespace.unity-sps.metadata[0].name
   }
-  # data = {
-  #   "celeryconfig.py" = "${chomp(data.template_file.celeryconfig.rendered)}"
-  # }
   data = {
     "celeryconfig.py" = "${chomp(templatefile("${path.module}/../../hysds/configs/${var.celeryconfig_filename}", {
       rabbitmq_service_port = var.service_port_map.rabbitmq_service_listener
@@ -92,20 +53,6 @@ resource "kubernetes_config_map" "netrc" {
   }
 }
 
-# data "template_file" "logstash-conf" {
-#   template = file("${path.module}/../../hysds/mozart/logstash/logstash.conf")
-#   vars = {
-#     mozart_es_port = var.service_port_map.mozart_es
-#   }
-# }
-
-# data "template_file" "logstash-yml" {
-#   template = file("${path.module}/../../hysds/mozart/logstash/logstash.yml")
-#   vars = {
-#     mozart_es_port = var.service_port_map.mozart_es
-#   }
-# }
-
 resource "kubernetes_config_map" "logstash-configs" {
   metadata {
     name      = "logstash-configs"
@@ -116,8 +63,6 @@ resource "kubernetes_config_map" "logstash-configs" {
     "event-status"  = "${file("${path.module}/../../hysds/mozart/logstash/event_status.template.json")}"
     "worker-status" = "${file("${path.module}/../../hysds/mozart/logstash/worker_status.template.json")}"
     "task-status"   = "${file("${path.module}/../../hysds/mozart/logstash/task_status.template.json")}"
-    # "logstash-conf" = "${chomp(data.template_file.logstash-conf.rendered)}"
-    # "logstash-yml"  = "${chomp(data.template_file.logstash-yml.rendered)}"
     "logstash-conf" = "${chomp(templatefile("${path.module}/../../hysds/mozart/logstash/logstash.conf", {
       mozart_es_port = var.service_port_map.mozart_es
     }))}"
@@ -201,14 +146,6 @@ resource "kubernetes_config_map" "supervisord-orchestrator" {
   }
 }
 
-# data "template_file" "datasets" {
-#   template = file("${path.module}/../../hysds/configs/${var.datasets_filename}")
-#   vars = {
-#     minio_service_api_port       = var.service_port_map.minio_service_api
-#     minio_service_interface_port = var.service_port_map.minio_service_interface
-#   }
-# }
-
 resource "kubernetes_config_map" "datasets" {
   metadata {
     name      = "datasets"
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/minio.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/minio.tf
deleted file mode 100644
index a793827..0000000
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/minio.tf
+++ /dev/null
@@ -1,229 +0,0 @@
-# resource "kubernetes_persistent_volume_claim" "minio-pv-claim" {
-#   metadata {
-#     name      = "minio-pv-claim"
-#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
-#     labels = {
-#       app = "minio-storage-claim"
-#     }
-#   }
-#   spec {
-#     access_modes = ["ReadWriteOnce"]
-#     resources {
-#       requests = {
-#         storage = "20Gi"
-#       }
-#     }
-#   }
-# }
-
-
-# resource "kubernetes_service" "minio-service" {
-#   metadata {
-#     name      = "minio"
-#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
-#   }
-
-#   spec {
-#     type             = var.service_type
-#     session_affinity = var.deployment_environment != "local" ? null : "ClientIP"
-#     port {
-#       name        = "minio-api"
-#       protocol    = "TCP"
-#       port        = var.service_port_map.minio_service_api
-#       target_port = 9000
-#       node_port   = var.service_type != "NodePort" ? null : var.node_port_map.minio_service_api
-#     }
-#     port {
-#       name        = "minio-interface"
-#       protocol    = "TCP"
-#       port        = var.service_port_map.minio_service_interface
-#       target_port = 9001
-#       node_port   = var.service_type != "NodePort" ? null : var.node_port_map.minio_service_interface
-#     }
-#     selector = {
-#       app = "minio"
-#     }
-#   }
-# }
-
-# resource "kubernetes_deployment" "minio" {
-#   metadata {
-#     name      = "minio"
-#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
-#     labels = {
-#       app = "minio"
-#     }
-#   }
-
-#   spec {
-#     # replicas = 2
-#     selector {
-#       match_labels = {
-#         app = "minio"
-#       }
-#     }
-#     strategy {
-#       type = "Recreate"
-#     }
-
-#     template {
-#       metadata {
-#         labels = {
-#           app = "minio"
-#         }
-#       }
-
-#       spec {
-#         container {
-#           image = var.docker_images.minio
-#           name  = "minio"
-#           # security_context {
-#           #   run_as_non_root = true
-#           # }
-#           # Run as non-root user
-#           # https://docs.min.io/docs/minio-docker-quickstart-guide
-#           args = ["server", "/storage", "--console-address=:9001"]
-#           env {
-#             name  = "MINIO_ACCESS_KEY"
-#             value = "hysds"
-#           }
-#           env {
-#             name  = "MINIO_SECRET_KEY"
-#             value = "password"
-#           }
-#           port {
-#             container_port = 9000
-#             host_port      = 9000
-#           }
-#           port {
-#             container_port = 9001
-#             host_port      = 9001
-#           }
-#           volume_mount {
-#             name       = "storage"
-#             mount_path = "/storage"
-#             read_only  = false
-#           }
-
-#         }
-
-#         volume {
-#           name = "storage"
-#           persistent_volume_claim {
-#             claim_name = kubernetes_persistent_volume_claim.minio-pv-claim.metadata[0].name
-#           }
-#         }
-#       }
-#     }
-#   }
-# }
-
-# resource "kubernetes_job" "mc" {
-#   metadata {
-#     name      = "mc"
-#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
-#   }
-#   spec {
-#     template {
-#       metadata {}
-#       spec {
-#         init_container {
-#           name    = "minio-setup"
-#           image   = var.docker_images.mc
-#           command = ["/bin/sh", "-c"]
-#           args = [
-#             <<-EOT
-#             until curl -s -I http://minio:${var.service_port_map.minio_service_api}; do echo "(Minio server) waiting..."; sleep 2; done;
-#             until curl -s -I http://minio:${var.service_port_map.minio_service_interface}; do echo "(Minio client) waiting..."; sleep 2; done;
-#             while [ $$(curl -sw '%%{http_code}' "http://minio:${var.service_port_map.minio_service_api}/minio/health/live" -o /dev/null) -ne 200 ]; do
-#               echo "Waiting for minio health live to be ready..." && sleep 5;
-#             done;
-#             mc alias set s3 http://minio:${var.service_port_map.minio_service_api} hysds password;
-#             mc mb s3/datasets;
-#             mc policy set public s3/datasets;
-#             EOT
-#           ]
-#         }
-#         container {
-#           name    = "publish-aoi"
-#           image   = var.docker_images.hysds_core
-#           command = ["/bin/sh", "-c"]
-#           args = [
-#             <<-EOT
-#             set -x;
-
-#             curl -XGET "http://grq-es:${var.service_port_map.grq2_es}/_cluster/health?pretty=true&wait_for_status=yellow&timeout=30s";
-#             while [ $$(curl -ILs http://grq2:${var.service_port_map.grq2_service}/api/v0.1/doc | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) -ne 200 ]; do
-#               echo "Waiting for GRQ2 to be ready..." && sleep 5;
-#             done;
-
-#             while [ $$(curl -sw '%%{http_code}' "http://grq-es:${var.service_port_map.grq2_es}" -o /dev/null) -ne 200 ]; do
-#               echo "Waiting for grq-es to be ready..." && sleep 5;
-#             done;
-
-#             curl -XGET "http://mozart-es:${var.service_port_map.mozart_es}/_cluster/health?pretty=true&wait_for_status=yellow&timeout=30s";
-#             while [ $$(curl -ILs http://mozart:${var.service_port_map.mozart_service}/api/v0.1/doc | tac | grep -m1 HTTP/1.1 | awk {'print $2'}) -ne 200 ]; do
-#               echo "Waiting for mozart to be ready..." && sleep 5;
-#             done;
-
-#             while [ $$(curl -sw '%%{http_code}' "http://mozart-es:${var.service_port_map.mozart_es}" -o /dev/null) -ne 200 ]; do
-#               echo "Waiting for mozart-es to be ready..." && sleep 5;
-#             done;
-
-#             cd /home/ops/hysds/test/examples;
-#             /home/ops/hysds/scripts/ingest_dataset.py AOI_sacramento_valley /home/ops/datasets.json;
-#             EOT
-#           ]
-#           volume_mount {
-#             name       = kubernetes_config_map.celeryconfig.metadata[0].name
-#             mount_path = "/home/ops/hysds/celeryconfig.py"
-#             sub_path   = "celeryconfig.py"
-#             read_only  = false
-#           }
-#           volume_mount {
-#             name       = kubernetes_config_map.aws-credentials.metadata[0].name
-#             mount_path = "/home/ops/.aws/credentials"
-#             sub_path   = "aws-credentials"
-#             read_only  = false
-#           }
-#           volume_mount {
-#             name       = kubernetes_config_map.datasets.metadata[0].name
-#             mount_path = "/home/ops/datasets.json"
-#             sub_path   = "datasets.json"
-#             read_only  = false
-#           }
-#         }
-#         volume {
-#           name = kubernetes_config_map.celeryconfig.metadata[0].name
-#           config_map {
-#             name = kubernetes_config_map.celeryconfig.metadata[0].name
-#           }
-#         }
-#         volume {
-#           name = kubernetes_config_map.aws-credentials.metadata[0].name
-#           config_map {
-#             name = kubernetes_config_map.aws-credentials.metadata[0].name
-#           }
-#         }
-#         volume {
-#           name = kubernetes_config_map.datasets.metadata[0].name
-#           config_map {
-#             name = kubernetes_config_map.datasets.metadata[0].name
-#           }
-#         }
-#         restart_policy = "Never"
-#       }
-#     }
-#   }
-#   depends_on = [
-#     kubernetes_deployment.grq2,
-#     kubernetes_deployment.mozart,
-#     helm_release.grq2-es,
-#     helm_release.mozart-es,
-#   ]
-#   wait_for_completion = true
-#   timeouts {
-#     create = "5m"
-#     update = "5m"
-#   }
-# }
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
index 5f6a388..6ca5185 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/outputs.tf
@@ -1,29 +1,9 @@
-# data "kubernetes_service" "grq-es" {
-#   metadata {
-#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
-#     name      = jsondecode(helm_release.grq2-es.metadata[0].values).masterService
-#   }
-# }
-
-# data "kubernetes_service" "mozart-es" {
-#   metadata {
-#     namespace = kubernetes_namespace.unity-sps.metadata[0].name
-#     name      = jsondecode(helm_release.mozart-es.metadata[0].values).masterService
-#   }
-# }
-
 # https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/data-sources/ingress
 # https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-to-elb-load-balancer.html
 
 output "load_balancer_hostnames" {
   description = "Load Balancer Ingress Hostnames"
   value = {
-    # hysds_ui        = kubernetes_service.hysds-ui-service.status[0].load_balancer[0].ingress[0].hostname,
-    # mozart_rest_api = kubernetes_service.mozart-service.status[0].load_balancer[0].ingress[0].hostname,
-    # grq_rest_api    = kubernetes_service.grq2-service.status[0].load_balancer[0].ingress[0].hostname,
-    # mozart_es       = data.kubernetes_service.mozart-es.status[0].load_balancer[0].ingress[0].hostname,
-    # grq_es          = data.kubernetes_service.grq-es.status[0].load_balancer[0].ingress[0].hostname,
     ades_wpst_api = kubernetes_service.ades-wpst-api-service.status[0].load_balancer[0].ingress[0].hostname,
-    # minio           = kubernetes_service.minio-service.status[0].load_balancer[0].ingress[0].hostname
   }
 }
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/s3.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/s3.tf
deleted file mode 100644
index a9fcb09..0000000
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/s3.tf
+++ /dev/null
@@ -1,28 +0,0 @@
-# locals {
-#   source_s3_directory = abspath("${path.module}/../../dev_data/SOURCE_S3/")
-# }
-
-
-# resource "aws_s3_bucket" "s3_bucket" {
-#   bucket        = "${var.project}-${var.venue}-${var.counter}-staging"
-#   force_destroy = true
-#   #   tags = {
-#   #     Name        = "My bucket"
-#   #     Environment = "Dev"
-#   #   }
-# }
-# resource "aws_s3_bucket_acl" "s3_bucket_acl" {
-#   bucket = aws_s3_bucket.s3_bucket.id
-#   acl    = "private"
-# }
-
-# resource "aws_s3_object" "source_files" {
-#   for_each = fileset(local.source_s3_directory, "**/*.*")
-#   bucket   = aws_s3_bucket.s3_bucket.id
-#   key      = each.value
-#   source   = "${local.source_s3_directory}/${each.value}"
-#   etag     = filemd5("${local.source_s3_directory}/${each.value}")
-#   depends_on = [
-#     aws_s3_bucket_acl.s3_bucket_acl
-#   ]
-# }
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf
index 3135db4..7cff4c2 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/variables.tf
@@ -40,8 +40,6 @@ variable "docker_images" {
     rabbitmq       = "rabbitmq:3-management"
     busybox        = "k8s.gcr.io/busybox"
     redis          = "redis:latest"
-    # minio          = "minio/minio:RELEASE.2022-03-17T06-34-49Z"
-    # mc             = "minio/mc:RELEASE.2022-03-13T22-34-00Z"
   }
 }
 
@@ -94,8 +92,6 @@ variable "service_port_map" {
     "ades_wpst_api_service"             = 5001
     "grq2_es"                           = 9201
     "mozart_es"                         = 9200
-    # "minio_service_api"                 = 9000
-    # "minio_service_interface"           = 9001
   }
 }
 
@@ -109,8 +105,6 @@ variable "node_port_map" {
     "ades_wpst_api_service" = 30011
     "grq2_es"               = 30012
     "mozart_es"             = 30013
-    # "minio_service_api"       = 30007
-    # "minio_service_interface" = 30008
   }
 }
 
diff --git a/terraform-test/terraform_unity_sps_test.go b/terraform-test/terraform_unity_sps_test.go
index ceb3b85..ff81df7 100644
--- a/terraform-test/terraform_unity_sps_test.go
+++ b/terraform-test/terraform_unity_sps_test.go
@@ -36,32 +36,7 @@ func TestTerraformUnity(t *testing.T) {
 	// Run `terraform output` to get the values of output variables
 	loadBalancerHostnames := terraform.OutputMap(t, terraformOptions, "load_balancer_hostnames")
 
-	// Make an HTTP request to the instance and make sure we get back a 200 OK
-	// hysds_ui_url := fmt.Sprintf("http://%s:3000", loadBalancerHostnames["hysds_ui"])
-	// statusCode, _ := http_helper.HttpGet(t, hysds_ui_url, nil)
-	// assert.Equal(t, statusCode, 200)
-
-	// mozart_rest_api_url := fmt.Sprintf("http://%s:8888/api/v0.1/", loadBalancerHostnames["mozart_rest_api"])
-	// statusCode, _ = http_helper.HttpGet(t, mozart_rest_api_url, nil)
-	// assert.Equal(t, statusCode, 200)
-
-	// mozart_es_url := fmt.Sprintf("http://%s:9200", loadBalancerHostnames["mozart_es"])
-	// statusCode, _ = http_helper.HttpGet(t, mozart_es_url, nil)
-	// assert.Equal(t, statusCode, 200)
-
-	// grq_rest_api_url := fmt.Sprintf("http://%s:8878/api/v0.1/", loadBalancerHostnames["grq_rest_api"])
-	// statusCode, _ = http_helper.HttpGet(t, grq_rest_api_url, nil)
-	// assert.Equal(t, statusCode, 200)
-
-	// grq_es_url := fmt.Sprintf("http://%s:9201", loadBalancerHostnames["grq_es"])
-	// statusCode, _ = http_helper.HttpGet(t, grq_es_url, nil)
-	// assert.Equal(t, statusCode, 200)
-
 	ades_wpst_api_url := fmt.Sprintf("http://%s:5001/api/docs", loadBalancerHostnames["ades_wpst_api"])
 	statusCode, _ := http_helper.HttpGet(t, ades_wpst_api_url, nil)
 	assert.Equal(t, statusCode, 200)
-
-	// minio_url := fmt.Sprintf("http://%s:9001", loadBalancerHostnames["minio"])
-	// statusCode, _ = http_helper.HttpGet(t, minio_url, nil)
-	// assert.Equal(t, statusCode, 200)
 }
diff --git a/terraform-unity/variables.tf b/terraform-unity/variables.tf
index 98221d3..d3af452 100644
--- a/terraform-unity/variables.tf
+++ b/terraform-unity/variables.tf
@@ -38,8 +38,6 @@ variable "docker_images" {
     rabbitmq       = "rabbitmq:3-management"
     busybox        = "k8s.gcr.io/busybox"
     redis          = "redis:latest"
-    # minio          = "minio/minio:RELEASE.2022-03-17T06-34-49Z"
-    # mc             = "minio/mc:RELEASE.2022-03-13T22-34-00Z"
   }
 }
 
@@ -79,8 +77,6 @@ variable "service_port_map" {
     "ades_wpst_api_service"             = 5001
     "grq2_es"                           = 9201
     "mozart_es"                         = 9200
-    # "minio_service_api"                 = 9000
-    # "minio_service_interface"           = 9001
   }
 }
 
@@ -94,8 +90,6 @@ variable "node_port_map" {
     "ades_wpst_api_service" = 30011
     "grq2_es"               = 30012
     "mozart_es"             = 30013
-    # "minio_service_api"       = 30007
-    # "minio_service_interface" = 30008
   }
 }
 

From 09b649285610ebb8f9986fd4fbb3fd60392eff81 Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 5 Dec 2022 10:40:36 -0800
Subject: [PATCH 10/13] chore: Remove staging of static data from local
 directory to verdi

---
 .../terraform-unity-sps-hysds-cluster/configs.tf | 16 ++--------------
 .../terraform-unity-sps-hysds-cluster/verdi.tf   | 13 -------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
index 53c6fb8..a17b82c 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/configs.tf
@@ -206,9 +206,8 @@ resource "kubernetes_config_map" "aws-credentials" {
 
 # https://github.com/hashicorp/terraform-provider-kubernetes/issues/1329
 locals {
-  cwl_workflows_directory            = "/Users/drewm/Documents/projects/398G/Unity/unity-sps-workflows/sounder_sips"
-  cwl_workflow_utils_directory       = "/Users/drewm/Documents/projects/398G/Unity/unity-sps-workflows/sounder_sips/utils"
-  sounder_sips_static_data_directory = abspath("${path.module}/../../dev_data/STATIC_DATA/SOUNDER_SIPS")
+  cwl_workflows_directory      = "/Users/drewm/Documents/projects/398G/Unity/unity-sps-workflows/sounder_sips"
+  cwl_workflow_utils_directory = "/Users/drewm/Documents/projects/398G/Unity/unity-sps-workflows/sounder_sips/utils"
 }
 
 resource "kubernetes_config_map" "cwl-workflows" {
@@ -232,14 +231,3 @@ resource "kubernetes_config_map" "cwl-workflow-utils" {
     f => file(join("/", [local.cwl_workflow_utils_directory, f]))
   }
 }
-
-resource "kubernetes_config_map" "sounder-sips-static-data" {
-  metadata {
-    name      = "sounder-sips-static-data"
-    namespace = kubernetes_namespace.unity-sps.metadata[0].name
-  }
-  data = {
-    for f in fileset(local.sounder_sips_static_data_directory, "*") :
-    f => filebase64sha256(join("/", [local.sounder_sips_static_data_directory, f]))
-  }
-}
diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
index 0538966..83dfc6e 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/verdi.tf
@@ -151,11 +151,6 @@ resource "kubernetes_deployment" "verdi" {
           #   mount_path = "/tmp/data"
           #   read_only  = false
           # }
-          # A persistent volume storing static data
-          volume_mount {
-            name       = kubernetes_config_map.sounder-sips-static-data.metadata[0].name
-            mount_path = "/static-data"
-          }
           # Directory containing the Sounder Sips specific workflow
           # TODO: remove and make it part of the deployment phase
           volume_mount {
@@ -208,14 +203,6 @@ resource "kubernetes_deployment" "verdi" {
           name = "docker-sock-dir"
           empty_dir {}
         }
-        # TODO: replace with an independent persistent volume holding static data
-        # https://stackoverflow.com/questions/48150179/how-to-mount-entire-directory-in-kubernetes-using-configmap
-        volume {
-          name = kubernetes_config_map.sounder-sips-static-data.metadata[0].name
-          config_map {
-            name = kubernetes_config_map.sounder-sips-static-data.metadata[0].name
-          }
-        }
         # TODO: remove and access the CWL workflow during the algorithm deployment
         volume {
           name = kubernetes_config_map.cwl-workflows.metadata[0].name

From 541ff86f30ddecb6934175a687da6062c926668e Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 23 Jan 2023 11:48:06 -0800
Subject: [PATCH 11/13] chore: Update smoketest

---
 terraform-test/terraform_unity_sps_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform-test/terraform_unity_sps_test.go b/terraform-test/terraform_unity_sps_test.go
index ff81df7..d09b362 100644
--- a/terraform-test/terraform_unity_sps_test.go
+++ b/terraform-test/terraform_unity_sps_test.go
@@ -19,7 +19,7 @@ func TestTerraformUnity(t *testing.T) {
 		TerraformDir: "../terraform-unity",
 
 		// Variables to pass to our Terraform code using -var-file options
-		VarFiles: []string{"terraform.tfvars"},
+		VarFiles: []string{"MCP_DEV.tfvars"},
 
 		// Disable colors in Terraform commands so its easier to parse stdout/stderr
 		NoColor: true,

From 50515dbf424c2db520e131ce4a0690a10f24e446 Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 23 Jan 2023 11:49:27 -0800
Subject: [PATCH 12/13] chore: Bump AWS resource version

---
 .../versions.tf                               |  2 +-
 terraform-unity/.terraform.lock.hcl           | 31 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/terraform-modules/terraform-unity-sps-hysds-cluster/versions.tf b/terraform-modules/terraform-unity-sps-hysds-cluster/versions.tf
index 8b227e7..966965d 100644
--- a/terraform-modules/terraform-unity-sps-hysds-cluster/versions.tf
+++ b/terraform-modules/terraform-unity-sps-hysds-cluster/versions.tf
@@ -11,7 +11,7 @@ terraform {
     }
     aws = {
       source  = "hashicorp/aws"
-      version = "4.23.0"
+      version = "4.51.0"
     }
     null = {
       source  = "hashicorp/null"
diff --git a/terraform-unity/.terraform.lock.hcl b/terraform-unity/.terraform.lock.hcl
index 3e4599c..1b8c436 100644
--- a/terraform-unity/.terraform.lock.hcl
+++ b/terraform-unity/.terraform.lock.hcl
@@ -2,22 +2,25 @@
 # Manual edits may be lost in future updates.
 
 provider "registry.terraform.io/hashicorp/aws" {
-  version     = "4.23.0"
-  constraints = "4.23.0"
+  version     = "4.51.0"
+  constraints = "4.51.0"
   hashes = [
-    "h1:HwrH+CiCwsK0EaDTOBl9rdEXiRnvqIJIUolJV74+kvQ=",
-    "zh:17adbedc9a80afc571a8de7b9bfccbe2359e2b3ce1fffd02b456d92248ec9294",
-    "zh:23d8956b031d78466de82a3d2bbe8c76cc58482c931af311580b8eaef4e6a38f",
-    "zh:343fe19e9a9f3021e26f4af68ff7f4828582070f986b6e5e5b23d89df5514643",
-    "zh:6b8ff83d884b161939b90a18a4da43dd464c4b984f54b5f537b2870ce6bd94bc",
-    "zh:7777d614d5e9d589ad5508eecf4c6d8f47d50fcbaf5d40fa7921064240a6b440",
-    "zh:82f4578861a6fd0cde9a04a1926920bd72d993d524e5b34d7738d4eff3634c44",
+    "h1:gcJ7Wl7NSFTacEekzzkggUTCn9KMsGr8TH2mXrj9EJ4=",
+    "zh:10aebfd8f22f7a69a2fcfcf35cb17ebbc0966ac8e822a9a0e1c843e429389de7",
+    "zh:26661203ab083ec35a5ae2d9b516793d98f4380655bcd304724af7495aaa7c09",
+    "zh:27ad57b820666a252e64959a4369fe9e40df5bf5d37a6ee272cc9131a501448f",
+    "zh:5d7b1acfae1a7835509d8f501e4e731cac2246b9f5b6674b643790d6eaca8037",
+    "zh:62cb21d9c90fd6b7af5c4b4d47f3e2908c3c7087809f3faeb561c4a12b14cbf5",
+    "zh:731490aa24ffe958e23f67619b897c96178a1c628453b02727c69f15dc90ff7b",
+    "zh:7b85f3513da571db05ad43f6a1ba195ab33ce8284f03537b636b561c1ad43075",
     "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
-    "zh:a08fefc153bbe0586389e814979cf7185c50fcddbb2082725991ed02742e7d1e",
-    "zh:ae789c0e7cb777d98934387f8888090ccb2d8973ef10e5ece541e8b624e1fb00",
-    "zh:b4608aab78b4dbb32c629595797107fc5a84d1b8f0682f183793d13837f0ecf0",
-    "zh:ed2c791c2354764b565f9ba4be7fc845c619c1a32cefadd3154a5665b312ab00",
-    "zh:f94ac0072a8545eebabf417bc0acbdc77c31c006ad8760834ee8ee5cdb64e743",
+    "zh:9d8f3b176046f438768d8b1ba25d2bb8d234499a2c2c8fa0e1336c84ae708c41",
+    "zh:bec27993d9501fb84df58d7f0b3eed2c8243e61f3676e66de17a9e2a8ff2f5be",
+    "zh:cd27798991a86b44adab3969db96666dde12309caf55e40bffe90bd895a6edd3",
+    "zh:dba49fdf4339a941357944616b1bf79483c2bed31c235e4cd59698802c8d2fdb",
+    "zh:ed1ccf97ec02191e0840ac4fdbd2da21eea661b9d7e11c0f98b71ab67a3d3718",
+    "zh:edeb801e3c84e653dc3449a0b73b64d1ba167cef674863ae5106d9a063548c70",
+    "zh:f680647b4fce3d7603a24ae69c32cf6664fb0182844d00f18ddae3d5d878441c",
   ]
 }
 

From 32f774b67428ccba88a188c09bc79f6ab444ab10 Mon Sep 17 00:00:00 2001
From: Drew Meyers <drew.meyers@jpl.nasa.gov>
Date: Mon, 23 Jan 2023 11:56:53 -0800
Subject: [PATCH 13/13] Chore: Remove hardcoded branch

---
 .github/workflows/terraform_static_analysis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/terraform_static_analysis.yml b/.github/workflows/terraform_static_analysis.yml
index be1cae5..05e8f00 100644
--- a/.github/workflows/terraform_static_analysis.yml
+++ b/.github/workflows/terraform_static_analysis.yml
@@ -160,7 +160,6 @@ jobs:
         name: Load TFLint Config
         with:
           source-repo: unity-sds/unity-sps-prototype
-          source-ref: 16-deploy-eks-mcp
           source-path: .github/config/.tflint.hcl
 
       - name: Setup TFLint