Merge pull request #120 from USA-RedDragon/remove-local-files

Proposing removal of `env.configFilePath` and `env.secretsFilePath`

Author: nikolasrieble

env-config.yaml

@@ -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.

env-secrets.yaml

@@ -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 }}

templates/_helpers.tpl

@@ -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 }}

templates/config-map.yaml

@@ -264,8 +264,6 @@ openshift:
   enabled: false
 
 env:
-  # configFilePath: env-config.yaml
-  # secretsFilePath: # env-secrets.yaml
   # configMapRefs:
   #   - name:
   # secretRefs: