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

Jason/s28 3373/keda #792

Draft
wants to merge 12 commits into
base: S28-3373/keda
Choose a base branch
from
Draft

Jason/s28 3373/keda #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
90cc725
use java postgres instance
jasonpaige Nov 5, 2024
5c7ec9f
bump and remove postgres chart
jasonpaige Nov 5, 2024
e8ce7cc
bitnami postgres
jasonpaige Nov 5, 2024
44cb27f
try this
jasonpaige Nov 5, 2024
d553033
Merge branch 'S28-3373/keda' into jason/S28-3373/keda
jasonpaige Nov 5, 2024
77b3ac9
this
jasonpaige Nov 5, 2024
bee0548
hardcode
jasonpaige Nov 5, 2024
696d869
Merge branch 'S28-3373/keda' into jason/S28-3373/keda
jasonpaige Nov 5, 2024
b80d82d
dfg
jasonpaige Nov 5, 2024
824d306
moar hardcode
jasonpaige Nov 5, 2024
14aaf49
db hostname
jasonpaige Nov 6, 2024
53c6d5f
fixes?
jasonpaige Nov 6, 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
5 changes: 1 addition & 4 deletions charts/pre-api/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@ dependencies:
- name: function
version: 2.5.3
repository: https://hmctspublic.azurecr.io/helm/v1/repo/
- name: postgresql
version: 1.0.2
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
condition: postgresql.enabled
condition: java.enabled
26 changes: 19 additions & 7 deletions charts/pre-api/values.dev.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
global:
postgresql:
auth:
username: pre
password: testpass
database: api

java:
devmemoryLimits: '2048Mi'
postgresql:
enabled: true
environment:
RUN_DB_MIGRATION_ON_STARTUP: true
POSTGRES_HOST: "{{ .Release.Name }}-postgresql"
POSTGRES_DATABASE: "{{ .Values.global.postgresql.auth.database }}"
POSTGRES_USER: "{{ .Values.global.postgresql.auth.username }}"
POSTGRES_PASSWORD: "{{ .Values.global.postgresql.auth.password }}"
TESTING_SUPPORT_ENDPOINTS_ENABLED: true
APIM_ENABLED: false
AZURE_MEDIA_SERVICES_ACCOUNT_NAME: preamsstg
Expand All @@ -13,15 +26,10 @@ java:
MEDIA_SERVICE: MediaKind
AZURE_INGEST_SA: preingestsastg
AZURE_FINAL_SA: prefinalsastg
postgresql:
enabled: true
auth:
username: ${POSTGRES_USER}
password: ${POSTGRES_PASSWORD}
database: ${POSTGRES_DATABASE}
# Don't modify below here
image: ${IMAGE_NAME}
ingressHost: ${SERVICE_FQDN}

function:
scaleType: Job
image: ${IMAGE_NAME}
Expand All @@ -32,6 +40,10 @@ function:
scalingStrategy: accurate
environment:
RUN_DB_MIGRATION_ON_STARTUP: true
POSTGRES_HOST: "{{ .Release.Name }}-postgresql"
POSTGRES_DATABASE: "{{ .Values.global.postgresql.auth.database }}"
POSTGRES_USER: "{{ .Values.global.postgresql.auth.username }}"
POSTGRES_PASSWORD: "{{ .Values.global.postgresql.auth.password }}"
TESTING_SUPPORT_ENDPOINTS_ENABLED: true
APIM_ENABLED: false
AZURE_MEDIA_SERVICES_ACCOUNT_NAME: preamsstg
Expand All @@ -44,7 +56,7 @@ function:
AZURE_INGEST_SA: preingestsastg
AZURE_FINAL_SA: prefinalsastg
TASK_NAME: PerformEditRequest
DB_CONNECTION_STRING: "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DATABASE}"
DB_CONNECTION_STRING: "postgresql://{{ .Values.global.postgresql.auth.username }}:{{ .Values.global.postgresql.auth.password }}@{{ .Release.Name }}-postgresql:5432/{{ .Values.global.postgresql.auth.database }}"
job:
parallelism: 1
completions: 1
Expand Down