🧑‍💻 Add some Init Containers

* Add some Init Containers to make sure Postgres is up * Governance/Multitenant Agent * Mediator * Trust Registry * NATS does not depend on Istio
didx-xyz · Feb 8, 2025 · baf4eb4 · baf4eb4
1 parent 549838e
commit baf4eb4
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 3 deletions.
diff --git a/helm/acapy-cloud/conf/dev/governance-agent.yaml b/helm/acapy-cloud/conf/dev/governance-agent.yaml
@@ -137,6 +137,20 @@ initContainers:
         value: "{{ .Values.env.NATS_SERVER }}"
       - name: NATS_STREAM
         value: "{{ .Values.env.NATS_STREAM }}"
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
 
 persistence:
   enabled: false

diff --git a/helm/acapy-cloud/conf/dev/mediator.yaml b/helm/acapy-cloud/conf/dev/mediator.yaml
@@ -106,6 +106,20 @@ readinessProbe:
 #     memory: 384Mi
 
 initContainers:
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
   - name: wait-governance-agent
     image: curlimages/curl
     command:

diff --git a/helm/acapy-cloud/conf/dev/multitenant-agent.yaml b/helm/acapy-cloud/conf/dev/multitenant-agent.yaml
@@ -118,6 +118,20 @@ initContainers:
         value: "{{ .Values.env.NATS_SERVER }}"
       - name: NATS_STREAM
         value: "{{ .Values.env.NATS_STREAM }}"
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
 
 persistence:
   enabled: true

diff --git a/helm/acapy-cloud/conf/dev/trust-registry.yaml b/helm/acapy-cloud/conf/dev/trust-registry.yaml
@@ -70,8 +70,13 @@ readinessProbe:
 autoscaling:
   enabled: false
 
+initContainers:
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z cloudapi-pgproxy 5432; do echo waiting for pgproxy; sleep 2; done;']
+
 secretData:
-  POSTGRES_DATABASE_URL: postgresql://trust-registry:trust-registry@cloudapi-postgresql:5432/trust-registry?sslmode=prefer
+  POSTGRES_DATABASE_URL: postgresql://trust-registry:trust-registry@cloudapi-pgproxy:5432/trust-registry?sslmode=prefer
 
 env:
   LOG_LEVEL: warning

diff --git a/helm/acapy-cloud/conf/local/governance-agent.yaml b/helm/acapy-cloud/conf/local/governance-agent.yaml
@@ -137,6 +137,20 @@ initContainers:
         value: "{{ .Values.env.NATS_SERVER }}"
       - name: NATS_STREAM
         value: "{{ .Values.env.NATS_STREAM }}"
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
 
 persistence:
   enabled: false

diff --git a/helm/acapy-cloud/conf/local/mediator.yaml b/helm/acapy-cloud/conf/local/mediator.yaml
@@ -106,6 +106,20 @@ readinessProbe:
 #     memory: 384Mi
 
 initContainers:
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
   - name: wait-governance-agent
     image: curlimages/curl
     command:

diff --git a/helm/acapy-cloud/conf/local/multitenant-agent.yaml b/helm/acapy-cloud/conf/local/multitenant-agent.yaml
@@ -119,6 +119,20 @@ initContainers:
         value: "{{ .Values.env.NATS_SERVER }}"
       - name: NATS_STREAM
         value: "{{ .Values.env.NATS_STREAM }}"
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z $(PG_HOST) $(PG_PORT); do echo waiting for postgres; sleep 2; done;']
+    env:
+      - name: PG_HOST
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_HOST
+      - name: PG_PORT
+        valueFrom:
+          secretKeyRef:
+            name: '{{ include "acapy-cloud.fullname" . }}-env'
+            key: WALLET_DB_PORT
 
 persistence:
   enabled: true

diff --git a/helm/acapy-cloud/conf/local/trust-registry.yaml b/helm/acapy-cloud/conf/local/trust-registry.yaml
@@ -70,8 +70,13 @@ readinessProbe:
 autoscaling:
   enabled: false
 
+initContainers:
+  - name: nc-postgres
+    image: busybox
+    command: ['sh', '-c', 'until nc -z cloudapi-pgproxy 5432; do echo waiting for pgproxy; sleep 2; done;']
+
 secretData:
-  POSTGRES_DATABASE_URL: postgresql://trust-registry:trust-registry@cloudapi-postgresql:5432/trust-registry?sslmode=prefer
+  POSTGRES_DATABASE_URL: postgresql://trust-registry:trust-registry@$cloudapi-pgproxy:5432/trust-registry?sslmode=prefer
 
 env:
   LOG_LEVEL: warning

diff --git a/tilt/acapy-cloud/Tiltfile b/tilt/acapy-cloud/Tiltfile
@@ -125,7 +125,6 @@ def setup_nats(namespace):
         resource_deps=[
             "cloudapi-ns",
             "build-nats",
-            "istio",
         ],
         port_forwards=[
             port_forward(8222, name="monitoring"),