Merge pull request #54 from olhado/image_cmd_cleanup

Removing disable of auditd, as we have read-only volume access now.

Author: olhado

values.yaml

@@ -38,11 +38,11 @@ gkeContainerOsCmd:
     - >-
         chroot /threatstackfs /bin/bash -c 'systemctl stop systemd-journald-audit.socket;
         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 &&
-        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS &&
+        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;
+        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS;
         exec /opt/threatstack/sbin/tsagentd -logstdout=1
 
 # Using Ubuntu nodes
@@ -52,11 +52,11 @@ gkeUbuntuCmd:
   args:
     - -c
     - >-
-        chroot /threatstackfs /bin/bash -c 'systemctl stop auditd; systemctl disable auditd' &&
-        eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
-        eval tsagent config --set $THREATSTACK_CONFIG_ARGS &&
-        sleep 5 &&
-        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS &&
+        chroot /threatstackfs /bin/bash -c 'systemctl stop auditd';
+        eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_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 EKS Amazon Linux 2 nodes
@@ -66,11 +66,11 @@ eksAmazon2Cmd:
   args:
     - -c
     - >-
-        chroot /threatstackfs /bin/bash -c 'service auditd stop; systemctl disable auditd' &&
-        eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_ARGS &&
-        eval tsagent config --set $THREATSTACK_CONFIG_ARGS &&
-        sleep 5 &&
-        unset THREATSTACK_SETUP_DEPLOY_KEY THREATSTACK_SETUP_ARGS THREATSTACK_CONFIG_ARGS &&
+        chroot /threatstackfs /bin/bash -c 'service auditd stop';
+        eval tsagent setup --deploy-key $THREATSTACK_SETUP_DEPLOY_KEY $THREATSTACK_SETUP_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
 
 # Uncomment the command and args sub-attributes, and define them as desired to run custom commands in the Daemonset.