Creates a separate deployment for k8s VPC databases

Author: ianbibby

infrared/manifest.star

@@ -17,7 +17,7 @@ sidecars = []
 iam_role = ""
 repository = "artifactory.build.ue1.snooguts.net/reddit-docker-dev/" + git_repo_name
 
-clusters_to_monitor = [
+clusters_to_monitor_legacy_vpc = [
     {
         "name"     : "pga-r2-account",
         "endpoint" : "pga-r2-account.cluster-cgzk1xobcfng.us-east-1.rds.amazonaws.com:5432/newreddit",
@@ -79,28 +79,29 @@ clusters_to_monitor_k8s_vpc = [
     },
 ]
 
-def create_deployment():
-    if env() == Production:
-        repository = "artifactory.build.ue1.snooguts.net/reddit-docker-prod/" + git_repo_name
+if env() == Production:
+    repository = "artifactory.build.ue1.snooguts.net/reddit-docker-prod/" + git_repo_name
 
-        iam_role = "arn:aws:iam::210246326331:role/prod-3.kubernetes.ue1.k8s-postgres-exporter-pod"
-        service_account = "postgres-exporter"
+    iam_role = "arn:aws:iam::210246326331:role/prod-3.kubernetes.ue1.k8s-postgres-exporter-pod"
+    service_account = "postgres-exporter"
 
-        requests = bp.resources(cpu = "200m", mem = "128Mi")
-        autoscaler = bp.autoscale(
-            cpu_utilization = 70,
-            min_replicas = 1,
-            max_replicas = 1,
-        )
-    else:
-        config_file = "development.yaml"
-        requests = bp.resources(cpu = "200m", mem = "128Mi")
-        service_account = "snoodev"
+    requests = bp.resources(cpu = "200m", mem = "128Mi")
+    autoscaler = bp.autoscale(
+        cpu_utilization = 70,
+        min_replicas = 1,
+        max_replicas = 1,
+    )
+else:
+    config_file = "development.yaml"
+    requests = bp.resources(cpu = "200m", mem = "128Mi")
+    service_account = "snoodev"
 
-    release = bp.release(name = fullname)
+
+def create_deployment(name, node_specialization, clusters_to_monitor):
+    release = bp.release(name = name)
 
     conf = release.config(
-        name = fullname,
+        name = name,
         filename = "production.yaml",
         contents = file("%s.yaml" % env()),
         tags = [],
@@ -129,12 +130,8 @@ def create_deployment():
         ],
     )
 
-
-    if env() == Production:
-        node_specialization = "prod-vpc-apps"
-
     svc = release.service(
-        name = fullname,
+        name = name,
         type = service_type,
         ports = [metrics_port],
     )
@@ -161,7 +158,7 @@ def create_deployment():
         )
 
     release.deploy(
-        name = fullname,
+        name = name,
         container = container,
         config = conf,
         services = [svc],
@@ -173,20 +170,9 @@ def create_deployment():
         sidecars = sidecars,
     )
 
-    release.deploy(
-        name = fullname,
-        container = container,
-        config = conf,
-        services = [svc],
-        replicas = 1,
-        service_account = service_account,
-        iam_role = iam_role,
-        node_specialization = "",
-        autoscale = autoscaler,
-        sidecars = sidecars,
-    )
-
-create_deployment()
+if env() == Production:
+    create_deployment(fullname, "prod-vpc-apps", clusters_to_monitor_legacy_vpc) # Giving the name of <fullname> causes it to be patched later on.
+    create_deployment("k8s-vpc-"+fullname,"", clusters_to_monitor_k8s_vpc)
 
 # This fixes an inconsistency in our naming scheme for node taints.
 # Remove when the starlark resource generator handles this issue gracefully.