Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bridge Workflow updates and fixes #8

Merged
merged 5 commits into from
Oct 1, 2024
Merged

Bridge Workflow updates and fixes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
828a375
Chart fixes and added questions.yaml
PSNAppz Sep 30, 2024
b3ea72e
Chart fixes
PSNAppz Sep 30, 2024
b45bc1c
Replace hostname with global.g2pBridgeHostname
PSNAppz Sep 30, 2024
cd54982
Removed hostname
PSNAppz Sep 30, 2024
dff2101
Publish Workflow update
PSNAppz Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/push_trigger.yml → .github/workflows/publish-trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions charts/openg2p-g2p-bridge-api/templates/gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions charts/openg2p-g2p-bridge-api/templates/virtualservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions charts/openg2p-g2p-bridge-api/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 0 additions & 1 deletion charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
global:
g2pBridgeHostname: ''

hostname: ''
nameOverride: g2p-bridge-celery-beat
fullnameOverride: g2p-bridge-celery-beat

Expand Down
1 change: 0 additions & 1 deletion charts/openg2p-g2p-bridge-celery-workers/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
global:
g2pBridgeHostname: ''

hostname: ''
nameOverride: g2p-bridge-celery-workers
fullnameOverride: g2p-bridge-celery-workers

Expand Down
1 change: 1 addition & 0 deletions charts/openg2p-g2p-bridge/app-readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OpenG2P G2P Bridge installation using Rancher.
20 changes: 20 additions & 0 deletions charts/openg2p-g2p-bridge/questions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions charts/openg2p-g2p-bridge/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
global:
g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net

openg2p-g2p-bridge-api:
enabled: true
common:
Expand Down Expand Up @@ -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:
Expand Down
Loading