Change where the unset occurs

Author: Michael Chmielewski

templates/daemonset.yaml

@@ -102,8 +102,8 @@ spec:
           - >-
               eval "tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS" &&
               tsagent config --set $THREATSTACK_CONFIG_ARGS &&
-              exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
-              unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
+              unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS &&
+              exec /opt/threatstack/sbin/tsagentd -logstdout=1
 {{- end }}
 {{- if .Values.daemonset.livenessProbe }}
         livenessProbe:

templates/deployment-api-reader.yaml

@@ -94,8 +94,8 @@ spec:
           - >-
               eval "tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS" &&
               tsagent config --set $THREATSTACK_CONFIG_ARGS &&
-              exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
-              unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
+              unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS &&
+              exec /opt/threatstack/sbin/tsagentd -logstdout=1
 {{- if .Values.apiReader.livenessProbe }}
         livenessProbe:
 {{ toYaml .Values.apiReader.livenessProbe | indent 10 }}

values.yaml

@@ -40,8 +40,10 @@ gkeContainerOsCmd:
         systemctl mask systemd-journald-audit.socket;
         systemctl restart systemd-journald; auditctl --backlog_wait_time 0' &&
         eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
-        eval tsagent config --set $THREATSTACK_CONFIG_ARGS && sleep 5 && exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
-        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
+        eval tsagent config --set $THREATSTACK_CONFIG_ARGS &&
+        sleep 5 &&
+        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS &&
+        exec /opt/threatstack/sbin/tsagentd -logstdout=1
 
 # Using Ubuntu nodes
 gkeUbuntu: false
@@ -54,8 +56,8 @@ gkeUbuntuCmd:
         eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
         eval tsagent config --set $THREATSTACK_CONFIG_ARGS &&
         sleep 5 &&
-        exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
-        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
+        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS &&
+        exec /opt/threatstack/sbin/tsagentd -logstdout=1
 
 # Using EKS Amazon Linux 2 nodes
 eksAmazon2: false
@@ -68,8 +70,8 @@ eksAmazon2Cmd:
         eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
         eval tsagent config --set $THREATSTACK_CONFIG_ARGS &&
         sleep 5 &&
-        exec /opt/threatstack/sbin/tsagentd -logstdout=1 &&
-        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
+        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS &&
+        exec /opt/threatstack/sbin/tsagentd -logstdout=1
 
 # Uncomment the command and args sub-attributes, and define them as desired to run custom commands in the Daemonset.
 #
@@ -86,8 +88,8 @@ customDaemonsetCmd: {}
   #       eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
   #       eval tsagent config --set $THREATSTACK_CONFIG_ARGS &&
   #       sleep 5 &&
-  #       /opt/threatstack/sbin/tsagentd -logstdout=1 &&
-  #       unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS
+  #       unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS &&
+  #       /opt/threatstack/sbin/tsagentd -logstdout=1
 
 # Using OpenShift
 #