From 584f30e129d44abe07e226349296ec22e80096e7 Mon Sep 17 00:00:00 2001 From: ConduktorBot Date: Thu, 27 Mar 2025 17:39:17 +0000 Subject: [PATCH 1/3] Update chart gateway version to 3.7.1 --- charts/gateway/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gateway/Chart.yaml b/charts/gateway/Chart.yaml index 2078e42..8382520 100644 --- a/charts/gateway/Chart.yaml +++ b/charts/gateway/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "3.7.0" description: Conduktor Gateway chart name: conduktor-gateway -version: 3.7.0 +version: 3.7.1 dependencies: - name: common version: 2.x.x From fae027af7ee0898215ad125091903138dafae487 Mon Sep 17 00:00:00 2001 From: Quentin Boileau Date: Fri, 28 Mar 2025 10:05:40 +0100 Subject: [PATCH 2/3] Fix potential duplicate GATEWAY_SECURED_METRICS environment --- charts/gateway/templates/_helpers.tpl | 2 +- charts/gateway/templates/deployment.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/gateway/templates/_helpers.tpl b/charts/gateway/templates/_helpers.tpl index ad52b0d..23b6267 100644 --- a/charts/gateway/templates/_helpers.tpl +++ b/charts/gateway/templates/_helpers.tpl @@ -146,7 +146,7 @@ Get the first admin user from the list of users {{/* Check if env exist in context - +Usage : include "conduktor-gateway.envExists" (dict "envkey" "ENV_VAR_NAME" "context" $) Params: - envKey - String - Required - Name of the env. - context - Context - Required - Parent context. diff --git a/charts/gateway/templates/deployment.yaml b/charts/gateway/templates/deployment.yaml index 443192f..19f2da7 100644 --- a/charts/gateway/templates/deployment.yaml +++ b/charts/gateway/templates/deployment.yaml @@ -54,8 +54,10 @@ spec: - name: JAVA_TOOL_OPTIONS value: {{ tpl .Values.gateway.jmx.jvmArgs . | quote }} {{- end}} + {{- if eq (include "conduktor-gateway.envExists" (dict "envkey" "GATEWAY_SECURED_METRICS" "context" $)) "false" }} - name: GATEWAY_SECURED_METRICS value: {{ .Values.gateway.admin.securedMetrics | quote }} + {{- end}} {{- if and .Values.gateway.userPool .Values.gateway.userPool.serviceAccountRequired }} - name: GATEWAY_USER_POOL_SERVICE_ACCOUNT_REQUIRED value: {{ .Values.gateway.userPool.serviceAccountRequired | quote }} From 6f83d71d4844284ebbd4ed6a41b99fd1f26ba4e3 Mon Sep 17 00:00:00 2001 From: Quentin Date: Fri, 28 Mar 2025 10:39:01 +0100 Subject: [PATCH 3/3] Update charts/gateway/Chart.yaml --- charts/gateway/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gateway/Chart.yaml b/charts/gateway/Chart.yaml index 8382520..2078e42 100644 --- a/charts/gateway/Chart.yaml +++ b/charts/gateway/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "3.7.0" description: Conduktor Gateway chart name: conduktor-gateway -version: 3.7.1 +version: 3.7.0 dependencies: - name: common version: 2.x.x