refactor tiltfile and kustomize for better integration

env/base/runner-deployment.yaml

@@ -25,7 +25,7 @@ spec:
               memory: "64Mi"
           volumeMounts:
             - mountPath: /config/
-              name: bh-runner-config
+              name: runner-config
       containers:
         - name: runner
           image: barretthousen/service-runner:latest
@@ -37,17 +37,17 @@ spec:
               memory: "128Mi"
           volumeMounts:
             - mountPath: /config/
-              name: bh-runner-config
+              name: runner-config
       volumes:
-        - name: bh-runner-config
+        - name: runner-config
           configMap:
-            name: bh-runner-config
+            name: runner-config
 
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: bh-runner-config
+  name: runner-config
 data:
   config.yaml: |
     log_level: 2

src/Tiltfile

@@ -23,7 +23,6 @@ helm_resource(
     labels=["1-ingress"]
 )
 
-
 helm_resource(
     'postgres',
     'bitnami/postgresql',
@@ -37,20 +36,9 @@ helm_resource(
     port_forwards=["5432:5432"],
     labels=["9-data"])
 
-helm_resource(
-    'loki-stack',
-    'grafana/loki-stack',
-    resource_deps=['grafana'],
-    flags=[
-        '--set', 'fluent-bit.enabled=false',
-        '--set', 'promtail.enabled=false',
-        '--set', 'loki.enabled=false',
-    ],
-    port_forwards=["3000:80"],
-    labels=["9-monitoring"])
 
 
-def bh_service(service=""):
+def bh_service(service="", port_forwards=[], labels=['2-services']):
     docker_build(
         ref="barretthousen/service-{}".format(service),
         dockerfile="./Dockerfile.service",
@@ -65,13 +53,30 @@ def bh_service(service=""):
         ]
     )
 
+    k8s_resource(
+        workload='local-{}'.format(service),
+        port_forwards=port_forwards,
+        labels=labels,
+        resource_deps=['postgres']
+    )
 
 
 
-bh_service(service="runner")
+bh_service(service="runner", port_forwards=[5001])
 
 k8s_yaml(
     kustomize("../env/local")
 )
 
-k8s_resource(workload='local-runner', port_forwards=5001)
+
+# helm_resource(
+#     'loki-stack',
+#     'grafana/loki-stack',
+#     resource_deps=['grafana'],
+#     flags=[
+#         '--set', 'fluent-bit.enabled=false',
+#         '--set', 'promtail.enabled=false',
+#         '--set', 'loki.enabled=false',
+#     ],
+#     port_forwards=["3000:80"],
+#     labels=["9-monitoring"])