Merge pull request #8 from PSNAppz/develop

Bridge Workflow updates and fixes
OpenG2P · Oct 1, 2024 · dea1174 · dea1174
2 parents 241e3dd + dff2101
commit dea1174
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 12 deletions.
diff --git a/.github/workflows/push_trigger.yml → .github/workflows/publish-trigger.yml b/.github/workflows/push_trigger.yml → .github/workflows/publish-trigger.yml
@@ -1,11 +1,10 @@
-name: Publish OpenG2P Helm charts on
+name: Publish OpenG2P Helm charts
 
 on:
   push:
-    tags-ignore:
+    tags:
       - '**'
-    branches:
-      - 1.*
+    branches-ignore:
       - develop
       - main
   workflow_dispatch:

diff --git a/charts/openg2p-g2p-bridge-api/templates/gateway.yaml b/charts/openg2p-g2p-bridge-api/templates/gateway.yaml
@@ -18,7 +18,7 @@ spec:
       number: 8080
       protocol: HTTP2
     hosts:
-      - {{ default .Values.hostname .Values.istio.gateway.host | quote }}
+      - {{ default .Values.global.g2pBridgeHostname .Values.istio.gateway.host | quote }}
     {{- if .Values.istio.gateway.httpTlsRedirect }}
     tls:
       httpsRedirect: true
@@ -30,7 +30,7 @@ spec:
       number: 8443
       protocol: HTTPS
     hosts:
-      - {{ default .Values.hostname .Values.istio.gateway.host | quote }}
+      - {{ default .Values.global.g2pBridgeHostname .Values.istio.gateway.host | quote }}
     tls:
       {{ toYaml (omit .Values.istio.gateway.tls "enabled") | nindent 6 }}
   {{- end }}

diff --git a/charts/openg2p-g2p-bridge-api/templates/virtualservice.yaml b/charts/openg2p-g2p-bridge-api/templates/virtualservice.yaml
@@ -10,14 +10,14 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.hostname .Values.istio.virtualservice.host | quote }}
+  - {{ default .Values.global.g2pBridgeHostname .Values.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "common.names.fullname" .) .Values.istio.virtualservice.gateway }}
   http:
   - headers:
       request:
         set:
-          x-forwarded-host: {{ default .Values.hostname .Values.istio.virtualservice.host | quote }}
+          x-forwarded-host: {{ default .Values.global.g2pBridgeHostname .Values.istio.virtualservice.host | quote }}
           x-forwarded-proto: https
     match:
     - uri:

diff --git a/charts/openg2p-g2p-bridge-api/values.yaml b/charts/openg2p-g2p-bridge-api/values.yaml
@@ -1,7 +1,6 @@
 global:
-  g2pBridgeHostname: g2p-bridge.dev.openg2p.org
+  g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net
 
-hostname: g2p-bridge.dev.openg2p.org
 nameOverride: openg2p-g2p-bridge-api
 fullnameOverride: openg2p-g2p-bridge-api
 

diff --git a/charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml b/charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml
@@ -1,7 +1,6 @@
 global:
   g2pBridgeHostname: ''
 
-hostname: ''
 nameOverride: g2p-bridge-celery-beat
 fullnameOverride: g2p-bridge-celery-beat
 

diff --git a/charts/openg2p-g2p-bridge-celery-workers/values.yaml b/charts/openg2p-g2p-bridge-celery-workers/values.yaml
@@ -1,7 +1,6 @@
 global:
   g2pBridgeHostname: ''
 
-hostname: ''
 nameOverride: g2p-bridge-celery-workers
 fullnameOverride: g2p-bridge-celery-workers
 

diff --git a/charts/openg2p-g2p-bridge/app-readme.md b/charts/openg2p-g2p-bridge/app-readme.md
@@ -0,0 +1 @@
+OpenG2P G2P Bridge installation using Rancher.
diff --git a/charts/openg2p-g2p-bridge/questions.yaml b/charts/openg2p-g2p-bridge/questions.yaml
@@ -0,0 +1,20 @@
+questions:
+- variable: global.g2pBridgeHostname
+  description: Hostname under which all Bridge services will be accessed
+  type: string
+  label: G2P Bridge Hostname
+
+- variable: openg2p-g2p-bridge-api.enabled
+  description: Install G2P Bridge API
+  type: boolean
+  label: G2P Bridge API
+
+- variable: openg2p-g2p-bridge-celery-beat-producers.enabled
+  description: Install G2P Bridge Celery Beat Producers
+  type: boolean
+  label: G2P Bridge Celery Beat Producers
+
+- variable: openg2p-g2p-bridge-celery-workers.enabled
+  description: Install G2P Bridge Celery Workers
+  type: boolean
+  label: G2P Bridge Celery Workers
diff --git a/charts/openg2p-g2p-bridge/values.yaml b/charts/openg2p-g2p-bridge/values.yaml
@@ -1,3 +1,6 @@
+global:
+  g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net
+
 openg2p-g2p-bridge-api:
   enabled: true
   common:
@@ -25,6 +28,11 @@ openg2p-g2p-bridge-celery-beat-producers:
     G2P_BRIDGE_CELERY_BEAT_DB_HOSTNAME: '{{ .Release.Name }}-postgresql'
     G2P_BRIDGE_CELERY_BEAT_CELERY_BROKER_URL: redis://{{ .Release.Name }}-redis-master:6379/0
     G2P_BRIDGE_CELERY_BEAT_CELERY_BACKEND_URL: redis://{{ .Release.Name }}-redis-master:6379/0
+    G2P_BRIDGE_CELERY_BEAT_MAPPER_RESOLVE_FREQUENCY: 10
+    G2P_BRIDGE_CELERY_BEAT_FUNDS_AVAILABLE_CHECK_FREQUENCY: 10
+    G2P_BRIDGE_CELERY_BEAT_FUNDS_BLOCKED_FREQUENCY: 10
+    G2P_BRIDGE_CELERY_BEAT_FUNDS_DISBURSEMENT_FREQUENCY: 10
+    G2P_BRIDGE_CELERY_BEAT_MT940_PROCESSOR_FREQUENCY: 10
 
   envVarsFrom:
     G2P_BRIDGE_CELERY_BEAT_DB_PASSWORD: