From 828a3752abc9353c86cf3ffa85a2ad498cdf7ebb Mon Sep 17 00:00:00 2001 From: PSNAppZ Date: Mon, 30 Sep 2024 17:06:40 +0530 Subject: [PATCH 1/5] Chart fixes and added questions.yaml --- charts/openg2p-g2p-bridge-api/values.yaml | 4 ++-- .../values.yaml | 2 +- .../values.yaml | 2 +- charts/openg2p-g2p-bridge/app-readme.md | 1 + charts/openg2p-g2p-bridge/questions.yaml | 20 +++++++++++++++++++ charts/openg2p-g2p-bridge/values.yaml | 8 ++++++++ 6 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 charts/openg2p-g2p-bridge/app-readme.md create mode 100644 charts/openg2p-g2p-bridge/questions.yaml diff --git a/charts/openg2p-g2p-bridge-api/values.yaml b/charts/openg2p-g2p-bridge-api/values.yaml index cdf51bb..f912975 100644 --- a/charts/openg2p-g2p-bridge-api/values.yaml +++ b/charts/openg2p-g2p-bridge-api/values.yaml @@ -1,7 +1,7 @@ global: - g2pBridgeHostname: g2p-bridge.dev.openg2p.org + g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net -hostname: g2p-bridge.dev.openg2p.org +hostname: '{{ .Values.global.g2pBridgeHostname }}' 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 index 79950f1..9e66c00 100644 --- a/charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml +++ b/charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml @@ -1,7 +1,7 @@ global: g2pBridgeHostname: '' -hostname: '' +hostname: '{{ .Values.global.g2pBridgeHostname }}' 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 index 25fdd82..9455cc6 100644 --- a/charts/openg2p-g2p-bridge-celery-workers/values.yaml +++ b/charts/openg2p-g2p-bridge-celery-workers/values.yaml @@ -1,7 +1,7 @@ global: g2pBridgeHostname: '' -hostname: '' +hostname: '{{ .Values.global.g2pBridgeHostname }}' 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 new file mode 100644 index 0000000..2897258 --- /dev/null +++ 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 new file mode 100644 index 0000000..b7b7d8a --- /dev/null +++ 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 index a1889b3..d7bd2ac 100644 --- 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: From b3ea72ec814ea6a50d0c82a1ff41f660d1f95f39 Mon Sep 17 00:00:00 2001 From: PSNAppZ Date: Mon, 30 Sep 2024 17:27:07 +0530 Subject: [PATCH 2/5] Chart fixes --- charts/openg2p-g2p-bridge-api/values.yaml | 2 +- charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml | 2 +- charts/openg2p-g2p-bridge-celery-workers/values.yaml | 2 +- charts/openg2p-g2p-bridge/values.yaml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/openg2p-g2p-bridge-api/values.yaml b/charts/openg2p-g2p-bridge-api/values.yaml index f912975..cd66ca5 100644 --- a/charts/openg2p-g2p-bridge-api/values.yaml +++ b/charts/openg2p-g2p-bridge-api/values.yaml @@ -1,7 +1,7 @@ global: g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net -hostname: '{{ .Values.global.g2pBridgeHostname }}' +hostname: '' 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 index 9e66c00..79950f1 100644 --- a/charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml +++ b/charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml @@ -1,7 +1,7 @@ global: g2pBridgeHostname: '' -hostname: '{{ .Values.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 index 9455cc6..25fdd82 100644 --- a/charts/openg2p-g2p-bridge-celery-workers/values.yaml +++ b/charts/openg2p-g2p-bridge-celery-workers/values.yaml @@ -1,7 +1,7 @@ global: g2pBridgeHostname: '' -hostname: '{{ .Values.global.g2pBridgeHostname }}' +hostname: '' nameOverride: g2p-bridge-celery-workers fullnameOverride: g2p-bridge-celery-workers diff --git a/charts/openg2p-g2p-bridge/values.yaml b/charts/openg2p-g2p-bridge/values.yaml index d7bd2ac..4c103d9 100644 --- a/charts/openg2p-g2p-bridge/values.yaml +++ b/charts/openg2p-g2p-bridge/values.yaml @@ -2,6 +2,7 @@ global: g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net openg2p-g2p-bridge-api: + hostname: g2p-bridge.sandbox.openg2p.net enabled: true common: enabled: false From b45bc1c3b8dc09808af00f937c1b7235644b4ad9 Mon Sep 17 00:00:00 2001 From: PSNAppZ Date: Mon, 30 Sep 2024 17:38:57 +0530 Subject: [PATCH 3/5] Replace hostname with global.g2pBridgeHostname --- charts/openg2p-g2p-bridge-api/templates/gateway.yaml | 4 ++-- charts/openg2p-g2p-bridge-api/templates/virtualservice.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/openg2p-g2p-bridge-api/templates/gateway.yaml b/charts/openg2p-g2p-bridge-api/templates/gateway.yaml index 8083264..d65a56d 100644 --- 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 index cc1ff3d..b4ed64e 100644 --- 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: From cd549824776a628a94e59619a34630c7ce7d13de Mon Sep 17 00:00:00 2001 From: PSNAppZ Date: Mon, 30 Sep 2024 17:39:39 +0530 Subject: [PATCH 4/5] Removed hostname --- charts/openg2p-g2p-bridge-api/values.yaml | 1 - charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml | 1 - charts/openg2p-g2p-bridge-celery-workers/values.yaml | 1 - charts/openg2p-g2p-bridge/values.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/charts/openg2p-g2p-bridge-api/values.yaml b/charts/openg2p-g2p-bridge-api/values.yaml index cd66ca5..1abd1ef 100644 --- a/charts/openg2p-g2p-bridge-api/values.yaml +++ b/charts/openg2p-g2p-bridge-api/values.yaml @@ -1,7 +1,6 @@ global: g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net -hostname: '' 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 index 79950f1..fde6b16 100644 --- 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 index 25fdd82..8b07d53 100644 --- 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/values.yaml b/charts/openg2p-g2p-bridge/values.yaml index 4c103d9..d7bd2ac 100644 --- a/charts/openg2p-g2p-bridge/values.yaml +++ b/charts/openg2p-g2p-bridge/values.yaml @@ -2,7 +2,6 @@ global: g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net openg2p-g2p-bridge-api: - hostname: g2p-bridge.sandbox.openg2p.net enabled: true common: enabled: false From dff21017902374f09946203fcbea609f838b7326 Mon Sep 17 00:00:00 2001 From: PSNAppZ Date: Tue, 1 Oct 2024 13:02:49 +0530 Subject: [PATCH 5/5] Publish Workflow update --- .../workflows/{push_trigger.yml => publish-trigger.yml} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename .github/workflows/{push_trigger.yml => publish-trigger.yml} (97%) diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/publish-trigger.yml similarity index 97% rename from .github/workflows/push_trigger.yml rename to .github/workflows/publish-trigger.yml index 9a1d18e..83adc17 100644 --- a/.github/workflows/push_trigger.yml +++ b/.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: