Ver código fonte

updating clusterenv

Stefan McShane 3 anos atrás
pai
commit
b801463b79
2 arquivos alterados com 69 adições e 38 exclusões
  1. 32 1
      Tiltfile
  2. 37 37
      zarf/helm/kustomization.yaml

+ 32 - 1
Tiltfile

@@ -1,4 +1,5 @@
 load('ext://restart_process', 'docker_build_with_restart')
+load('ext://dotenv', 'dotenv')
 
 secret_settings(disable_scrub=True)
 
@@ -53,6 +54,36 @@ docker_build_with_restart(
 #     only=['dashboard/package.json', 'dashboard/package-lock.json']
 # )
 
+# docker_build(
+#     ref="porter1/porter-dashboard",
+#     context=".",
+#     dockerfile="zarf/docker/Dockerfile.dashboard.tilt",
+#     build_args={'node_env': 'development'},
+#     entrypoint='npm start',
+#     ignore=[
+#         "dashboard/node_modules",
+#         "dashboard/package-lock.json",
+#         "dashboard/webpack.config.js"
+#     ],
+#     live_update=[
+#         sync('dashboard', '/app'),
+#         run('cd /app && npm start', trigger=['./package.json']),
+
+#         # # if all that changed was start-time.txt, make sure the server
+#         # # reloads so that it will reflect the new startup time
+#         # run('touch /app/index.js', trigger='./start-time.txt'),
+# ])
+
+dotenv(fn='zarf/helm/.dashboard.env')
+
+local_resource(
+    name="porter-dashboard",
+    serve_cmd="npm start",
+    serve_dir="dashboard",
+    resource_deps=["postgresql"],
+    labels=["porter"]
+)
+
 allow_k8s_contexts('kind-porter')
 
 cluster = str(local('kubectl config current-context')).strip()
@@ -70,7 +101,7 @@ if (cluster.startswith("kind-")):
     updated_install = encode_yaml_stream(decoded)
     k8s_yaml(updated_install)
     k8s_resource(workload='porter-server-web', port_forwards="8080:8080", labels=["porter"])
-    k8s_resource(workload='porter-dashboard-web', port_forwards="8081:8081", labels=["porter"], resource_deps=["postgresql"])
+    # k8s_resource(workload='porter-dashboard-web', port_forwards="8081:8081", labels=["porter"], resource_deps=["postgresql"])
 else:
     local("echo 'Be careful that you aren't connected to a staging or prod cluster' && exit 1")
     exit()

+ 37 - 37
zarf/helm/kustomization.yaml

@@ -6,16 +6,16 @@ helmCharts:
   repo: https://charts.getporter.dev
   releaseName: porter-server
   valuesFile: server.yaml
-- name: web
-  repo: https://charts.getporter.dev
-  releaseName: porter-dashboard
-  valuesFile: dashboard.yaml
+# - name: web
+#   repo: https://charts.getporter.dev
+#   releaseName: porter-dashboard
+#   valuesFile: dashboard.yaml
 
 configMapGenerator:
 - name: porter-server-env
   env: .server.env
-- name: porter-dashboard-env
-  env: .dashboard.env
+# - name: porter-dashboard-env
+  # env: .dashboard.env
 generatorOptions:
   disableNameSuffixHash: true
 
@@ -33,34 +33,34 @@ patchesStrategicMerge:
           envFrom:
           - configMapRef: 
               name: porter-server-env
-- |-
-  apiVersion: apps/v1
-  kind: Deployment
-  metadata:
-    name: porter-dashboard-web
-  spec:
-    template:
-      spec:
-        containers:
-        - name: web
-          envFrom:
-          - configMapRef: 
-              name: porter-dashboard-env
-- |-
-  apiVersion: apps/v1
-  kind: Deployment
-  metadata:
-    name: porter-dashboard-web
-  spec:
-    template:
-      spec:
-        volumes:
-        - name: hot-reload
-          hostPath:
-            path: /host/porter/dashboard
-            type: ''
-        containers:
-        - name: web
-          volumeMounts:
-          - name: hot-reload
-            mountPath: /app
+# - |-
+#   apiVersion: apps/v1
+#   kind: Deployment
+#   metadata:
+#     name: porter-dashboard-web
+#   spec:
+#     template:
+#       spec:
+#         containers:
+#         - name: web
+#           envFrom:
+#           - configMapRef: 
+#               name: porter-dashboard-env
+# - |-
+#   apiVersion: apps/v1
+#   kind: Deployment
+#   metadata:
+#     name: porter-dashboard-web
+#   spec:
+#     template:
+#       spec:
+#         volumes:
+#         - name: hot-reload
+#           hostPath:
+#             path: /host/porter/dashboard
+#             type: ''
+#         containers:
+#         - name: web
+#           volumeMounts:
+#           - name: hot-reload
+#             mountPath: /app