From 89e67e5f1d0068abd7a01890026c06dcf280c4fd Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Wed, 4 Oct 2023 22:39:10 +0000
Subject: [PATCH] Make port vars distinct.

---
 .../stores/onepassword/helmrelease.yaml       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/kubernetes/apps/security/external-secrets/stores/onepassword/helmrelease.yaml b/kubernetes/apps/security/external-secrets/stores/onepassword/helmrelease.yaml
index 4c0a2d9..364caeb 100644
--- a/kubernetes/apps/security/external-secrets/stores/onepassword/helmrelease.yaml
+++ b/kubernetes/apps/security/external-secrets/stores/onepassword/helmrelease.yaml
@@ -18,15 +18,6 @@ spec:
         namespace: flux-system
 
   values:
-    env:
-      OP_BUS_PORT: "11220"
-      OP_BUS_PEERS: "localhost:11221"
-      OP_HTTP_PORT: &port 8080
-      OP_SESSION:
-        valueFrom:
-          secretKeyRef:
-            name: onepassword-connect-secret
-            key: onepassword-credentials.json
     controllers:
       main:
         annotations:
@@ -36,6 +27,15 @@ spec:
             image:
               repository: docker.io/1password/connect-api
               tag: 1.7.2
+            env:
+              OP_BUS_PORT: "11220"
+              OP_BUS_PEERS: "localhost:11221"
+              OP_HTTP_PORT: &port-connect 8080
+              OP_SESSION:
+                valueFrom:
+                  secretKeyRef:
+                    name: onepassword-connect-secret
+                    key: onepassword-credentials.json
             probes:
               liveness:
                 enabled: true
@@ -43,7 +43,7 @@ spec:
                 spec:
                   httpGet:
                     path: /heartbeat
-                    port: *port
+                    port: *port-connect
                   initialDelaySeconds: 15
                   periodSeconds: 30
                   failureThreshold: 3
@@ -53,7 +53,7 @@ spec:
                 spec:
                   httpGet:
                     path: /health
-                    port: *port
+                    port: *port-connect
                   initialDelaySeconds: 15
               startup:
                 enabled: true
@@ -61,7 +61,7 @@ spec:
                 spec:
                   httpGet:
                     path: /health
-                    port: *port
+                    port: *port-connect
                   failureThreshold: 30
                   periodSeconds: 5
                   successThreshold: 1
@@ -77,7 +77,7 @@ spec:
                     name: onepassword-connect-secret
                     key: onepassword-credentials.json
               - name: OP_HTTP_PORT
-                value: &port 8081
+                value: &port-sync 8081
               - name: OP_BUS_PORT
                 value: "11221"
               - name: OP_BUS_PEERS
@@ -86,12 +86,12 @@ spec:
               readinessProbe:
                 httpGet:
                   path: /health
-                  port: *port
+                  port: *port-sync
                 initialDelaySeconds: 15
               livenessProbe:
                 httpGet:
                   path: /heartbeat
-                  port: *port
+                  port: *port-sync
                 failureThreshold: 3
                 periodSeconds: 30
                 initialDelaySeconds: 15
@@ -103,7 +103,7 @@ spec:
       main:
         ports:
           http:
-            port: *port
+            port: *port-connect
 
     ingress:
       main: