Merge pull request #6 from Shreyas220/kiem_artifact_api

adding artifact api to kiem job
accuknox · Mar 29, 2024 · 6085b50 · 6085b50
2 parents b7d0cd3 + aa1a087
commit 6085b50
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/accuknox-cis-k8s/templates/cis-job.yaml b/accuknox-cis-k8s/templates/cis-job.yaml
@@ -13,7 +13,7 @@ spec:
           containers:
           - image: accuknox/accuknox-job:latest
             command: ["/bin/sh", "-c"]
-            args: ["curl --location --request POST 'https://$ENV_URL/api/v1/artifact/?tenant_id=$TENANT_ID&data_type=KB&save_to_s3=true'" --header "Authorization: Bearer $AUTH_TOKEN" --form 'file=@"./data/report.json"']
+            args: ["curl --location --request POST 'https://cspm.$ENV_URL.accuknox.com/api/v1/artifact/?tenant_id=$TENANT_ID&data_type=KB&save_to_s3=true'" --header "Authorization: Bearer $AUTH_TOKEN" --form 'file=@"./data/report.json"']
             name: accuknox-cis-cronjob
             resources: {}
             env:
@@ -26,9 +26,9 @@ spec:
               - name: CLUSTER_ID
                 value: {{ .Values.accuknox.clusterId }}
               - name: TENANT_ID
-                value: {{ .Values.accuknox.tenantId }}
+                value: {{ .Values.accuknox.tenantId | quote}}
               - name: ENV_URL
-                value: {{ .Values.accuknox.envURL }}
+                value: {{ .Values.accuknox.URL }}
             volumeMounts:
               - mountPath: /data
                 name: datapath

diff --git a/accuknox-cis-k8s/values.yaml b/accuknox-cis-k8s/values.yaml
@@ -9,4 +9,4 @@ accuknox:
   label: ""
   clusterId: ""
   tenantId: ""
-  envURL: ""
+  URL: "dev"
diff --git a/accuknox-k8tls-job/values.yaml b/accuknox-k8tls-job/values.yaml
@@ -6,4 +6,5 @@ accuknox:
   authToken: "NO-TOKEN-SET"
   cronTab: "0 */4 * * *"
   clusterName: ""
-  label: ""
+  label: ""
+  URL: "dev"
diff --git a/accuknox-kiem-job/templates/deployment.yaml b/accuknox-kiem-job/templates/deployment.yaml
@@ -27,11 +27,14 @@ spec:
                   mountPath: /data
           containers:
             - image: accuknox/accuknox-job:latest
-              command: ["/bin/sh", "-c"]
-              args: ["curl www.google.com && echo $AUTH_TOKEN"]
+              command: ['sh', '-c', 'curl --location --request POST "https://cspm.${URL}.accuknox.com/api/v1/artifact/?tenant_id=${TENANT_ID}&data_type=KIEM&save_to_s3=false" --header "Tenant-Id: ${TENANT_ID}" --header "Authorization: Bearer ${AUTH_TOKEN}" --form "file=@\"/data/report.json\""']
               name: accuknox-kiem-cronjob
               resources: {}
               env:
+                - name: URL
+                  value: {{ .Values.accuknox.URL }}
+                - name: TENANT_ID
+                  value: {{ .Values.accuknox.tenantID | quote }}
                 - name: AUTH_TOKEN
                   value: {{ .Values.accuknox.authToken }}
                 - name: CLUSTER_NAME

diff --git a/accuknox-kiem-job/values.yaml b/accuknox-kiem-job/values.yaml
@@ -6,6 +6,8 @@ replicaCount: 1
 
 accuknox:
   authToken: "NO-TOKEN-SET"
+  URL: "dev"
+  tenantID: ""
   cronTab: "0 */6 * * *"
   clusterName: ""
   label: ""