From c32d15d1e37ee30f1bced8922fc541eaa1a0e794 Mon Sep 17 00:00:00 2001 From: Alexander Buntakov Date: Fri, 25 Jun 2021 00:21:46 +0300 Subject: [PATCH] add env --- .../touchin-server/templates/deployment.yaml | 19 ++++++++++++++++++- starters/touchin-server/values.yaml | 5 +++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/starters/touchin-server/templates/deployment.yaml b/starters/touchin-server/templates/deployment.yaml index aec857d..0d8ad00 100644 --- a/starters/touchin-server/templates/deployment.yaml +++ b/starters/touchin-server/templates/deployment.yaml @@ -60,7 +60,24 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - env: [] + env: + - name: JAVA_OPTS + value: "{{ .Values.app.javaOpts }}" + - name: APP_PROFILE + value: "{{ .Values.profile }}" + - name: spring_datasource_password + valueFrom: + secretKeyRef: + name: "postgres12-{{ .Release.Namespace }}" + key: postgres-password + - name: spring_datasource_url + value: "jdbc:postgresql://postgres12-{{ .Release.Namespace }}:5432/{{ .Values.db.name }}" + - name: spring_datasource_username + value: "postgres" + - name: "management_metrics_export_elastic_enabled" + value: "{{ .Values.metrics.enabled }}" + - name: "management_metrics_export_elastic_host" + value: "{{ .Values.metrics.elasticSearchHost }}" ports: - name: http containerPort: {{ .Values.app.port }} diff --git a/starters/touchin-server/values.yaml b/starters/touchin-server/values.yaml index 9364d36..baff45c 100644 --- a/starters/touchin-server/values.yaml +++ b/starters/touchin-server/values.yaml @@ -49,6 +49,11 @@ db: app: port: 8080 + javaOpts: "-Xmx256m" + +metrics: + enabled: true + elasticSearchHost: http://app.elastic.ti:9200 origin: releaseBranch: ""