diff --git a/charts/openg2p-g2p-bridge-example-bank-api/templates/gateway.yaml b/charts/openg2p-g2p-bridge-example-bank-api/templates/gateway.yaml index 8083264..eabd4f2 100644 --- 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 index cc1ff3d..cf90123 100644 --- 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 index b0116cf..0581fa3 100644 --- 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: exampleBankHostname: example-bank.sandbox.openg2p.net -hostname: '' 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 index 1bb2f95..b1bac67 100644 --- 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: 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 new file mode 100644 index 0000000..1ee74eb --- /dev/null +++ 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 index fe870c0..8705fd0 100644 --- a/charts/openg2p-g2p-bridge-example-bank/values.yaml +++ b/charts/openg2p-g2p-bridge-example-bank/values.yaml @@ -1,8 +1,7 @@ global: - exampleBankHostname: example-bank.sandbox.openg2p.net + exampleBankHostname: example-bank.dev.openg2p.org openg2p-g2p-bridge-example-bank-api: - hostname: example-bank.sandbox.openg2p.net enabled: true common: enabled: false