Skip to content

Commit 136c5b9

Browse files
author
Michael Chmielewski
committed
Unset environment variables that might have sensitive data, after use
1 parent 17bf2e0 commit 136c5b9

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

templates/daemonset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ spec:
102102
- >-
103103
eval "tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS" &&
104104
tsagent config --set $THREATSTACK_CONFIG_ARGS &&
105-
exec /opt/threatstack/sbin/tsagentd -logstdout=1
105+
exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
106+
unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
106107
{{- end }}
107108
{{- if .Values.daemonset.livenessProbe }}
108109
livenessProbe:

templates/deployment-api-reader.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ spec:
9494
- >-
9595
eval "tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS" &&
9696
tsagent config --set $THREATSTACK_CONFIG_ARGS &&
97-
exec /opt/threatstack/sbin/tsagentd -logstdout=1
97+
exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
98+
unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
9899
{{- if .Values.apiReader.livenessProbe }}
99100
livenessProbe:
100101
{{ toYaml .Values.apiReader.livenessProbe | indent 10 }}

values.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ gkeContainerOsCmd:
4040
systemctl mask systemd-journald-audit.socket;
4141
systemctl restart systemd-journald; auditctl --backlog_wait_time 0' &&
4242
eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
43-
eval tsagent config --set $THREATSTACK_CONFIG_ARGS && sleep 5 && exec /opt/threatstack/sbin/tsagentd -logstdout=1
43+
eval tsagent config --set $THREATSTACK_CONFIG_ARGS && sleep 5 && exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
44+
unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
4445
4546
# Using Ubuntu nodes
4647
gkeUbuntu: false
@@ -53,7 +54,8 @@ gkeUbuntuCmd:
5354
eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
5455
eval tsagent config --set $THREATSTACK_CONFIG_ARGS &&
5556
sleep 5 &&
56-
exec /opt/threatstack/sbin/tsagentd -logstdout=1
57+
exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
58+
unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
5759
5860
# Using EKS Amazon Linux 2 nodes
5961
eksAmazon2: false
@@ -66,7 +68,8 @@ eksAmazon2Cmd:
6668
eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
6769
eval tsagent config --set $THREATSTACK_CONFIG_ARGS &&
6870
sleep 5 &&
69-
exec /opt/threatstack/sbin/tsagentd -logstdout=1
71+
exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
72+
unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
7073
7174
# Uncomment the command and args sub-attributes, and define them as desired to run custom commands in the Daemonset.
7275
#
@@ -83,7 +86,8 @@ customDaemonsetCmd: {}
8386
# eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
8487
# eval tsagent config --set $THREATSTACK_CONFIG_ARGS &&
8588
# sleep 5 &&
86-
# /opt/threatstack/sbin/tsagentd -logstdout=1
89+
# /opt/threatstack/sbin/tsagentd -logstdout=1 &&
90+
# unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
8791

8892
# Using OpenShift
8993
#

0 commit comments

Comments
 (0)