Merge pull request prometheus-community#11 from reddit/separate_k8s_vpc_deployment

Separate k8s vpc deployment for postgres-exporter

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",
@@ -66,6 +66,9 @@ clusters_to_monitor = [
         "name"     : "pga-r2-subreddit-15",
         "endpoint" : "pga-r2-subreddit-15.cluster-cgzk1xobcfng.us-east-1.rds.amazonaws.com:5432/newreddit",
     },
+]
+
+clusters_to_monitor_k8s_vpc = [
     {
         "name"     : "pga-reddit-service-preference",
         "endpoint" : "pga-reddit-service-preference.cluster-cgzk1xobcfng.us-east-1.rds.amazonaws.com",
@@ -93,81 +96,83 @@ else:
     requests = bp.resources(cpu = "200m", mem = "128Mi")
     service_account = "snoodev"
 
-release = bp.release(name = fullname)
-
-conf = release.config(
-    name = fullname,
-    filename = "production.yaml",
-    contents = file("%s.yaml" % env()),
-    tags = [],
-)
-
-metrics_port = release.port(
-    name = "metrics",
-    port = 9187,
-    container_port = 9187,
-)
-
-container = release.container(
-    name = "exporter",
-    repository = repository,
-    ports = [metrics_port],
-    requests = requests,
-    args = [
-        "--config.file", "/mnt/secrets/postgres-exporter.yaml",
-    ],
-    secret_files = [
-        bp.secret_file(
-            output_file = "postgres-exporter.yaml",
-            secret_path = "secret/postgres-exporter/config",
-            content_key = "current",
-        ),
-    ],
-)
 
+def create_deployment(name, node_specialization, clusters_to_monitor):
+    release = bp.release(name = name)
 
-if env() == Production:
-    node_specialization = "prod-vpc-apps"
-
-svc = release.service(
-    name = fullname,
-    type = service_type,
-    ports = [metrics_port],
-)
-
-for cluster in clusters_to_monitor:
-    release.podmonitor(
-        name   = cluster["name"],
-        port   = "metrics",
-        path   = "/probe",
-        params = {
-            "target": [cluster["endpoint"]],
-            "auth_module": ["repl_lag_monitor"],
-        },
-        relabelings = [
-            bp.relabel(
-                sourcelabels = ["__param_target"],
-                targetlabel  = "cluster_endpoint",
-            ),
-            bp.relabel(
-                replacement = cluster["name"],
-                targetlabel = "cluster_name",
+    conf = release.config(
+        name = name,
+        filename = "production.yaml",
+        contents = file("%s.yaml" % env()),
+        tags = [],
+    )
+
+    metrics_port = release.port(
+        name = "metrics",
+        port = 9187,
+        container_port = 9187,
+    )
+
+    container = release.container(
+        name = "exporter",
+        repository = repository,
+        ports = [metrics_port],
+        requests = requests,
+        args = [
+            "--config.file", "/mnt/secrets/postgres-exporter.yaml",
+        ],
+        secret_files = [
+            bp.secret_file(
+                output_file = "postgres-exporter.yaml",
+                secret_path = "secret/postgres-exporter/config",
+                content_key = "current",
             ),
         ],
     )
 
-release.deploy(
-    name = fullname,
-    container = container,
-    config = conf,
-    services = [svc],
-    replicas = 1,
-    service_account = service_account,
-    iam_role = iam_role,
-    node_specialization = node_specialization,
-    autoscale = autoscaler,
-    sidecars = sidecars,
-)
+    svc = release.service(
+        name = name,
+        type = service_type,
+        ports = [metrics_port],
+    )
+
+    for cluster in clusters_to_monitor:
+        release.podmonitor(
+            name   = cluster["name"],
+            port   = "metrics",
+            path   = "/probe",
+            params = {
+                "target": [cluster["endpoint"]],
+                "auth_module": ["repl_lag_monitor"],
+            },
+            relabelings = [
+                bp.relabel(
+                    sourcelabels = ["__param_target"],
+                    targetlabel  = "cluster_endpoint",
+                ),
+                bp.relabel(
+                    replacement = cluster["name"],
+                    targetlabel = "cluster_name",
+                ),
+            ],
+        )
+
+    release.deploy(
+        name = name,
+        container = container,
+        config = conf,
+        services = [svc],
+        replicas = 1,
+        service_account = service_account,
+        iam_role = iam_role,
+        node_specialization = node_specialization,
+        autoscale = autoscaler,
+        sidecars = sidecars,
+    )
+
+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.