Merge pull request #26 from accuknox/update-risk-assessment-job

fix: use sh in risk-assessment-job

k8s-risk-assessment-job/templates/configmap.yaml

@@ -5,17 +5,17 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   augment-and-push-results.sh: |
-    #! /bin/env bash
+    #! /bin/sh
 
     # get all controls
     jq -s 'map(.controls[]) | unique_by(.controlID) | .[]' /data/kubescape-cache/allcontrols.json \
       /data/kubescape-cache/clusterscan.json \
       /data/kubescape-cache/mitre.json /data/kubescape-cache/nsa.json > /data/controllist.json
 
-    export GENERATION_TIME=`date --utc --iso-8601=s`
+    export GENERATION_TIME=`date --utc -Isecond`
 
     # augment result
-    cat <<< $(jq ". +=
+    jq ". +=
       {
         "generationTime": "'$ENV.GENERATION_TIME'",
         "summary": {
@@ -26,7 +26,9 @@ data:
           "cluster_id": "'$ENV.CLUSTER_ID'",
           "label_name": "'$ENV.LABEL_NAME'"
         }
-      }" /data/report.json --slurpfile controllist /data/controllist.json) > /data/report.json
+      }" /data/report.json --slurpfile controllist /data/controllist.json > /data/report_tmp.json
+
+    mv /data/report_tmp.json /data/report.json
 
     cat /data/report.json
 
@@ -35,4 +37,4 @@ data:
     --header "Authorization: Bearer ${AUTH_TOKEN}" \
     --header "Tenant-Id: ${TENANT_ID}" \
     --form "file=@\"/data/report.json\"" \
-    "https://${URL}/api/v1/artifact/?tenant_id=${TENANT_ID}&data_type=KS&save_to_s3=false"
+    "https://${URL}/api/v1/artifact/?tenant_id=${TENANT_ID}&data_type=KS&save_to_s3=false&label_id=${LABEL_NAME}"

k8s-risk-assessment-job/templates/cronjob.yaml

@@ -29,7 +29,7 @@ spec:
             - image: accuknox/accuknox-job:latest
               name: artifact-api-container
               command:
-                - '/bin/bash'
+                - '/bin/sh'
                 - '/script/augment-and-push-results.sh'
               env:
                 - name: URL