From e18551330b08c2fb47b94497892c41fa9b48aff1 Mon Sep 17 00:00:00 2001 From: aagaev Date: Thu, 14 Dec 2023 09:21:02 +0000 Subject: [PATCH 1/2] ens chart fix envs --- charts/blockscout-ens/CHANGELOG.md | 6 ++ .../templates/blockscout-ens-deployment.yaml | 78 +++++++++---------- 2 files changed, 45 insertions(+), 39 deletions(-) diff --git a/charts/blockscout-ens/CHANGELOG.md b/charts/blockscout-ens/CHANGELOG.md index bbc558b..8ae1367 100644 --- a/charts/blockscout-ens/CHANGELOG.md +++ b/charts/blockscout-ens/CHANGELOG.md @@ -1,5 +1,11 @@ # ChangeLog +## 0.1.1 + +### Fixes + +- Fixed ENVs render + ## 0.1.0 - Initial release diff --git a/charts/blockscout-ens/templates/blockscout-ens-deployment.yaml b/charts/blockscout-ens/templates/blockscout-ens-deployment.yaml index 77c7d1e..fd7b1e5 100644 --- a/charts/blockscout-ens/templates/blockscout-ens-deployment.yaml +++ b/charts/blockscout-ens/templates/blockscout-ens-deployment.yaml @@ -51,45 +51,45 @@ spec: containerPort: 6060 protocol: TCP env: - - name: BENS__SERVER__HTTP__ADDR - value: '0.0.0.0:8050' - {{- if .Values.bens.config.logLevel }} - - name: RUST_LOG - value: {{- .Values.bens.config.logLevel }} - {{- end }} - {{- if .Values.bens.config.metricsEnabled }} - - name: BENS__METRICS__ENABLED - value: {{- .Values.bens.config.metricsEnabled }} - {{- end }} - {{- if .Values.bens.config.tracingFormat }} - - name: BENS__TRACING__FORMAT - value: {{- .Values.bens.config.tracingFormat }} - {{- end }} - {{- range $key, $value := .Values.bens.env }} - - name: {{ $key }} - value: {{ $value | quote }} - {{- end }} - {{- if .Values.bens.config.databaseUrl }} - - name: BENS__DATABASE__URL - value: {{ .Values.bens.config.databaseUrl }} - {{- else if .Values.bens.config.databaseName }} - - name: BENS__DATABASE__CONNECT__KV__USER - valueFrom: - secretKeyRef: - name: {{ .Values.bens.config.databaseCredsSecretName }} - key: {{ .Values.bens.config.databaseUserSecretKey }} - - name: BENS__DATABASE__CONNECT__KV__PASSWORD - valueFrom: - secretKeyRef: - name: {{ .Values.bens.config.databaseCredsSecretName }} - key: {{ .Values.bens.config.databasePasswordSecretKey }} - - name: BENS__DATABASE__CONNECT__KV__DBNAME - value: {{ .Values.bens.config.databaseName }} - - name: BENS__DATABASE__CONNECT__KV__HOST - value: {{ .Values.bens.config.databaseHost }} - - name: BENS__DATABASE__CONNECT__KV__PORT - value: {{ .Values.bens.config.databasePort }} - {{- end }} + - name: BENS__SERVER__HTTP__ADDR + value: 0.0.0.0:8050 + {{- if .Values.bens.config.logLevel }} + - name: RUST_LOG + value: {{ .Values.bens.config.logLevel }} + {{- end }} + {{- if .Values.bens.config.metricsEnabled }} + - name: BENS__METRICS__ENABLED + value: {{ .Values.bens.config.metricsEnabled }} + {{- end }} + {{- if .Values.bens.config.tracingFormat }} + - name: BENS__TRACING__FORMAT + value: {{ .Values.bens.config.tracingFormat }} + {{- end }} + {{- range $key, $value := .Values.bens.env }} + - name: {{ $key }} + value: {{ $value | quote }} + {{- end }} + {{- if .Values.bens.config.databaseUrl }} + - name: BENS__DATABASE__URL + value: {{ .Values.bens.config.databaseUrl }} + {{- else if .Values.bens.config.databaseName }} + - name: BENS__DATABASE__CONNECT__KV__USER + valueFrom: + secretKeyRef: + name: {{ .Values.bens.config.databaseCredsSecretName }} + key: {{ .Values.bens.config.databaseUserSecretKey }} + - name: BENS__DATABASE__CONNECT__KV__PASSWORD + valueFrom: + secretKeyRef: + name: {{ .Values.bens.config.databaseCredsSecretName }} + key: {{ .Values.bens.config.databasePasswordSecretKey }} + - name: BENS__DATABASE__CONNECT__KV__DBNAME + value: {{ .Values.bens.config.databaseName }} + - name: BENS__DATABASE__CONNECT__KV__HOST + value: {{ .Values.bens.config.databaseHost }} + - name: BENS__DATABASE__CONNECT__KV__PORT + value: {{ .Values.bens.config.databasePort }} + {{- end }} envFrom: - secretRef: name: {{ include "blockscout-ens.fullname" . }}-env From eda035fb27a718fa460e99d7ea7f8f46efac791e Mon Sep 17 00:00:00 2001 From: aagaev Date: Thu, 14 Dec 2023 09:33:18 +0000 Subject: [PATCH 2/2] ens chart fix envs --- charts/blockscout-ens/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/blockscout-ens/Chart.yaml b/charts/blockscout-ens/Chart.yaml index 7cf724b..19fcee2 100644 --- a/charts/blockscout-ens/Chart.yaml +++ b/charts/blockscout-ens/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.0" +appVersion: "0.1.1"