update browser kustomize configs to latest spec

broadinstitute · Dec 1, 2023 · c0e8bc8 · c0e8bc8
1 parent d34732a
commit c0e8bc8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 23 deletions.
diff --git a/deploy/deployctl/subcommands/browser_deployments.py b/deploy/deployctl/subcommands/browser_deployments.py
@@ -25,6 +25,23 @@
   - name: gnomad-browser
     newName: {browser_image_repository}
     newTag: '{browser_tag}'
+replacements:
+- source:
+    fieldPath: metadata.name
+    kind: Service
+    name: gnomad-api
+    version: v1
+  targets:
+  - fieldPaths:
+    - spec.template.spec.containers.0.env.0.value
+    options:
+      delimiter: /
+      index: 2
+    select:
+      group: apps
+      kind: Deployment
+      name: gnomad-browser
+      version: v1
 patches:
   - patch: |-
       - op: add
@@ -33,20 +50,19 @@
     target:
       kind: ServiceAccount
       labelSelector: "component=gnomad-api"
-patchesStrategicMerge:
-  - |-
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      name: gnomad-api
-    spec:
-      template:
-        spec:
-          containers:
-            - name: app
-              env:
-                - name: JSON_CACHE_PATH
-                  value: 'gs://{cluster_name}-gene-cache/2023-12-01'
+  - patch: |-
+      apiVersion: apps/v1
+      kind: Deployment
+      metadata:
+        name: gnomad-api
+      spec:
+        template:
+          spec:
+            containers:
+              - name: app
+                env:
+                  - name: JSON_CACHE_PATH
+                    value: 'gs://{cluster_name}-gene-cache/2023-12-01'
 """
 
 

diff --git a/deploy/manifests/browser/base/browser.deployment.yaml b/deploy/manifests/browser/base/browser.deployment.yaml
@@ -25,7 +25,7 @@ spec:
           imagePullPolicy: Always
           env:
             - name: API_URL
-              value: http://$(API_SERVICE)
+              value: http://API_SERVICE_PLACEHOLDER
             - name: PROXY_IPS
               valueFrom:
                 configMapKeyRef:

diff --git a/deploy/manifests/browser/base/kustomization.yaml b/deploy/manifests/browser/base/kustomization.yaml
@@ -7,11 +7,3 @@ resources:
   - ./browser.deployment.yaml
 configurations:
   - ./add-suffix.yaml
-vars:
-  - name: API_SERVICE
-    objref:
-      kind: Service
-      name: gnomad-api
-      apiVersion: v1
-    fieldref:
-      fieldpath: metadata.name