Skip to content

fix(Gateway): fix duplicate GATEWAY_SECURED_METRICS env #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 28, 2025
Merged

fix(Gateway): fix duplicate GATEWAY_SECURED_METRICS env #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
584f30e
Update chart gateway version to 3.7.1
ConduktorBot Mar 27, 2025
fae027a
Fix potential duplicate GATEWAY_SECURED_METRICS environment
qboileau Mar 28, 2025
6f83d71
Update charts/gateway/Chart.yaml
qboileau Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/gateway/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions charts/gateway/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down