Merge pull request #5 from PSNAppz/develop

Example Bank Fixes + Workflow updates
OpenG2P · Oct 1, 2024 · bb572d4 · bb572d4
2 parents d2e337b + ef0415a
commit bb572d4
Show file tree

Hide file tree

Showing 7 changed files with 28 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 Example Bank Helm charts
 
 on:
   push:
-    tags-ignore:
+    tags:
       - '**'
-    branches:
-      - 1.*
+    branches-ignore:
       - develop
       - main
   workflow_dispatch:

diff --git a/charts/openg2p-g2p-bridge-example-bank-api/templates/gateway.yaml b/charts/openg2p-g2p-bridge-example-bank-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.exampleBankHostname .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.exampleBankHostname .Values.istio.gateway.host | quote }}
     tls:
       {{ toYaml (omit .Values.istio.gateway.tls "enabled") | nindent 6 }}
   {{- end }}

diff --git a/charts/openg2p-g2p-bridge-example-bank-api/templates/virtualservice.yaml b/charts/openg2p-g2p-bridge-example-bank-api/templates/virtualservice.yaml
@@ -10,14 +10,14 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.hostname .Values.istio.virtualservice.host | quote }}
+  - {{ default .Values.global.exampleBankHostname .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.exampleBankHostname .Values.istio.virtualservice.host | quote }}
           x-forwarded-proto: https
     match:
     - uri:

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

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

diff --git a/charts/openg2p-g2p-bridge-example-bank/questions.yaml b/charts/openg2p-g2p-bridge-example-bank/questions.yaml
@@ -0,0 +1,16 @@
+questions:
+- variable: global.exampleBankHostname
+  description: Hostname under which all Example Bank services will be accessed
+  type: string
+  label: Example Bank Hostname
+
+- variable: openg2p-g2p-bridge-example-bank-api.enabled
+  description: Install G2P Bridge Example Bank API
+  type: boolean
+  label: G2P Bridge API
+
+- variable: openg2p-g2p-bridge-example-bank-celery.enabled
+  description: Install G2P Bridge Example Bank Celery
+  type: boolean
+  label: G2P Bridge Celery
+
diff --git a/charts/openg2p-g2p-bridge-example-bank/values.yaml b/charts/openg2p-g2p-bridge-example-bank/values.yaml
@@ -1,3 +1,6 @@
+global:
+  exampleBankHostname: example-bank.sandbox.openg2p.net
+
 openg2p-g2p-bridge-example-bank-api:
   enabled: true
   common: