Skip to content

Fix shouldIncludeConfigSecretsEnvVars output format #209

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
JatinNanda merged 1 commit into from
Jan 28, 2025
Merged

Fix shouldIncludeConfigSecretsEnvVars output format #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/retool/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: retool
description: A Helm chart for Kubernetes
type: application
version: 6.3.3
version: 6.3.4
maintainers:
- name: Retool Engineering
email: engineering+helm@retool.com
Expand Down
8 changes: 7 additions & 1 deletion charts/retool/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,5 +356,11 @@ Usage: (template "retool.codeExecutor.image.tag" .)
Checks whether or not ExternalSecret definitions are enabled and can potentially clobber secrets or explicitly allow additional direct secret refs.
*/}}
{{- define "shouldIncludeConfigSecretsEnvVars" -}}
{{- or (not (or (.Values.externalSecrets.enabled) (.Values.externalSecrets.externalSecretsOperator.enabled))) .Values.includeConfigSecrets -}}
{{- $output := "" -}}
{{- if or (not (or (.Values.externalSecrets.enabled) (.Values.externalSecrets.externalSecretsOperator.enabled))) .Values.externalSecrets.includeConfigSecrets -}}
{{- $output = "1" -}}
{{- else -}}
{{- $output = "" -}}
{{- end -}}
{{- $output -}}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/retool/templates/deployment_backend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ spec:

{{- include "retool.telemetry.includeEnvVars" . | nindent 10 }}

{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
- name: LICENSE_KEY
valueFrom:
secretKeyRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/retool/templates/deployment_jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:

{{- include "retool.telemetry.includeEnvVars" . | nindent 10 }}

{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
- name: LICENSE_KEY
valueFrom:
secretKeyRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/retool/templates/deployment_telemetry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
value: "/host/proc"
- name: SYSFS_ROOT
value: "/host/sys"
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
- name: LICENSE_KEY
valueFrom:
secretKeyRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/retool/templates/deployment_workflows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ spec:
- name: CODE_EXECUTOR_INGRESS_DOMAIN
value: http://{{ template "retool.codeExecutor.name" . }}
{{- end }}
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
- name: LICENSE_KEY
valueFrom:
secretKeyRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/retool/templates/deployment_workflows_worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ spec:
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: "http://$(HOST_IP):4317"
{{- end }}
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
- name: LICENSE_KEY
valueFrom:
secretKeyRef:
Expand Down
2 changes: 1 addition & 1 deletion charts/retool/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
apiVersion: v1
kind: Secret
metadata:
Expand Down
Loading