mysql issue fix
This commit is contained in:
parent
0b54e0983d
commit
03d088b692
@ -64,21 +64,14 @@ Create the name of the service account to use
|
|||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Get the effective database host
|
Get the effective database host
|
||||||
Returns host if set, otherwise derives from mysqlRelease if set
|
Priority: host > mysqlRelease > autoDerive (from namespace)
|
||||||
*/}}
|
*/}}
|
||||||
{{- define "schedulerservice.dbHost" -}}
|
{{- define "schedulerservice.dbHost" -}}
|
||||||
{{- if .Values.externalDatabase.host }}
|
{{- if .Values.externalDatabase.host }}
|
||||||
{{- .Values.externalDatabase.host }}
|
{{- .Values.externalDatabase.host }}
|
||||||
{{- else if .Values.externalDatabase.mysqlRelease }}
|
{{- else if .Values.externalDatabase.mysqlRelease }}
|
||||||
{{- printf "%s-mysql" .Values.externalDatabase.mysqlRelease }}
|
{{- printf "%s-mysql" .Values.externalDatabase.mysqlRelease }}
|
||||||
{{- end }}
|
{{- else if .Values.externalDatabase.autoDerive }}
|
||||||
{{- end }}
|
{{- printf "%s-os-schedules-argo-syncer-mysql" .Release.Namespace }}
|
||||||
|
|
||||||
{{/*
|
|
||||||
Check if database config is enabled (host or mysqlRelease is set)
|
|
||||||
*/}}
|
|
||||||
{{- define "schedulerservice.dbEnabled" -}}
|
|
||||||
{{- if or .Values.externalDatabase.host .Values.externalDatabase.mysqlRelease }}
|
|
||||||
{{- true }}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@ -84,7 +84,8 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if $dbHost }}
|
{{- if $dbHost }}
|
||||||
- name: db-config
|
- name: db-config
|
||||||
mountPath: /etc/onlinesales/db
|
mountPath: /etc/onlinesales/config/schedulerService/hibernate.cfg.xml
|
||||||
|
subPath: hibernate.cfg.xml
|
||||||
readOnly: true
|
readOnly: true
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@ -102,10 +102,11 @@ env:
|
|||||||
value: "DEBUG"
|
value: "DEBUG"
|
||||||
|
|
||||||
# External Database - connects to os-schedules-argo-syncer's MySQL subchart
|
# External Database - connects to os-schedules-argo-syncer's MySQL subchart
|
||||||
# mysqlRelease auto-derives host as {mysqlRelease}-mysql
|
# autoDerive: true will auto-derive host as {namespace}-os-schedules-argo-syncer-mysql
|
||||||
externalDatabase:
|
externalDatabase:
|
||||||
host: "" # Leave empty to use mysqlRelease-derived host
|
host: "" # Leave empty to use auto-derived host
|
||||||
mysqlRelease: "" # Set by Backstage: {namespace}-os-schedules-argo-syncer
|
mysqlRelease: "" # Optional: set to override auto-derive
|
||||||
|
autoDerive: true # Auto-derive host from namespace: {namespace}-os-schedules-argo-syncer-mysql
|
||||||
port: "3306"
|
port: "3306"
|
||||||
database: "os_scheduling_db"
|
database: "os_scheduling_db"
|
||||||
username: "scheduler_user"
|
username: "scheduler_user"
|
||||||
|
|||||||
@ -132,11 +132,14 @@ env: []
|
|||||||
|
|
||||||
# External Database configuration
|
# External Database configuration
|
||||||
# MySQL is deployed as a shared dependency (not a subchart)
|
# MySQL is deployed as a shared dependency (not a subchart)
|
||||||
# Set externalDatabase.host to connect to the shared MySQL instance
|
# Options (in priority order):
|
||||||
# Or set externalDatabase.mysqlRelease to auto-derive host as {mysqlRelease}-mysql
|
# 1. host: explicit MySQL host
|
||||||
|
# 2. mysqlRelease: derives host as {mysqlRelease}-mysql
|
||||||
|
# 3. autoDerive: derives host as {namespace}-os-schedules-argo-syncer-mysql
|
||||||
externalDatabase:
|
externalDatabase:
|
||||||
host: ""
|
host: ""
|
||||||
mysqlRelease: "" # If set, derives host as {mysqlRelease}-mysql
|
mysqlRelease: ""
|
||||||
|
autoDerive: false # Set to true to auto-derive host from namespace
|
||||||
port: "3306"
|
port: "3306"
|
||||||
database: "os_scheduling_db"
|
database: "os_scheduling_db"
|
||||||
username: "scheduler_user"
|
username: "scheduler_user"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user