diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 4819a17..5370964 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -71,7 +71,7 @@ spec: startupProbe: {{- toYaml .Values.startupProbe | nindent 12 }} env: - - name: {{ if semverCompare ">=1.19.0" .Values.fusionauthVersion }}DATABASE_USERNAME{{ else }}DATABASE_USER{{ end }} + - name: DATABASE_USERNAME value: {{ .Values.database.user }} - name: DATABASE_PASSWORD valueFrom: @@ -83,19 +83,19 @@ spec: secretKeyRef: name: {{ include "fusionauth.database.secretName" . }} key: rootpassword - - name: {{ if semverCompare ">=1.19.0" .Values.fusionauthVersion }}DATABASE_ROOT_USERNAME{{ else }}DATABASE_ROOT_USER{{ end }} + - name: DATABASE_ROOT_USERNAME value: {{ .Values.database.root.user }} - name: DATABASE_URL value: "jdbc:{{ .Values.database.protocol }}://{{- required "A valid database host is required!" .Values.database.host -}}:{{ .Values.database.port }}/{{ .Values.database.name }}{{ include "fusionauth.databaseTLS" . }}" - - name: {{ if semverCompare ">=1.19.0" .Values.fusionauthVersion }}SEARCH_TYPE{{ else }}FUSIONAUTH_SEARCH_ENGINE_TYPE{{ end }} + - name: SEARCH_TYPE value: {{ .Values.search.engine }} {{- if eq .Values.search.engine "elasticsearch" }} - - name: {{ if semverCompare ">=1.19.0" .Values.fusionauthVersion }}SEARCH_SERVERS{{ else }}FUSIONAUTH_SEARCH_SERVERS{{ end }} + - name: SEARCH_SERVERS value: "{{ .Values.search.protocol }}://{{ include "fusionauth.searchLogin" . }}{{- required "A valid elasticsearch host is required!" .Values.search.host -}}:{{ .Values.search.port }}" {{- end }} - - name: {{ if semverCompare ">=1.19.0" .Values.fusionauthVersion }}FUSIONAUTH_APP_MEMORY{{ else }}FUSIONAUTH_MEMORY{{ end }} + - name: FUSIONAUTH_APP_MEMORY value: {{ .Values.app.memory }} - - name: {{ if semverCompare ">=1.19.0" .Values.fusionauthVersion }}FUSIONAUTH_APP_RUNTIME_MODE{{ else }}FUSIONAUTH_RUNTIME_MODE{{ end }} + - name: FUSIONAUTH_APP_RUNTIME_MODE value: {{ .Values.app.runtimeMode }} {{- range $key, $value := .Values.environment }} - name: {{ $key }} diff --git a/chart/values.yaml b/chart/values.yaml index 4f362f8..d84ef05 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -3,10 +3,9 @@ # Declare variables to be passed into your templates. replicaCount: 1 -fusionauthVersion: 1.19.0 image: repository: fusionauth/fusionauth-app - tag: 1.19.0 + tag: 1.19.6 pullPolicy: IfNotPresent imagePullSecrets: []