Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 0 additions & 47 deletions env-config.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions env-secrets.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,6 @@ and base64 encodes the value.
{{- end }}
{{- end }}

{{/*
Prints the file contents of the environment secrets file
and base64 encodes the value from the key-value pair.
*/}}
{{- define "helpers.enc-b64-secrets-file" }}
{{- range .Files.Lines .Values.env.secretsFilePath }}
{{- $kv := splitList ":" . -}}
{{- $k := first $kv -}}
{{- if and ($k) (eq (hasPrefix "#" $k) false) }}
{{ $k }}: {{ trim (last $kv) | b64enc }}
{{- end }}
{{- end }}
{{- end }}

{{/*
Define helper to conditionally add securityContext to agentWorkerPodTemplate.
It does not output anything if agentWorkerPodTemplate is empty and OpenShift is not enabled.
Expand Down
3 changes: 0 additions & 3 deletions templates/config-map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,3 @@ data:
TFE_METRICS_HTTP_PORT: "{{ .Values.tfe.metrics.httpPort }}"
TFE_METRICS_HTTPS_PORT: "{{ .Values.tfe.metrics.httpsPort }}"
{{- end }}
{{- if .Values.env.configFilePath }}
{{ .Files.Get .Values.env.configFilePath | indent 2 }}
{{- end }}
3 changes: 0 additions & 3 deletions templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,3 @@ metadata:
namespace: {{ .Release.Namespace }}
data:
{{- include "helpers.list-env-secrets" . | indent 2 }}
{{- if .Values.env.secretsFilePath }}
{{- include "helpers.enc-b64-secrets-file" . | indent 2 }}
{{- end }}
2 changes: 0 additions & 2 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,6 @@ openshift:
enabled: false

env:
# configFilePath: env-config.yaml
# secretsFilePath: # env-secrets.yaml
# configMapRefs:
# - name:
# secretRefs:
Expand Down
Loading