#36 Add configurable resource limits & requests for the scan containers

J12934 · J12934 · commit a7e29b10f280 · 2020-06-29T10:19:25.000+02:00
diff --git a/scanners/amass/templates/amass-scan-type.yaml b/scanners/amass/templates/amass-scan-type.yaml
@@ -26,6 +26,8 @@ spec:
                 - name: "amass-config"
                   mountPath: "/amass/output/config.ini"
                   subPath: "config.ini"
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
           volumes:
             - name: "amass-config"
               configMap:
diff --git a/scanners/amass/values.yaml b/scanners/amass/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-amass
   tag: latest
+
+scannerJob:
+  resources: {}
diff --git a/scanners/kube-hunter/templates/kubehunter-scan-type.yaml b/scanners/kube-hunter/templates/kubehunter-scan-type.yaml
@@ -20,3 +20,5 @@ spec:
                 - '/wrapper.sh'
                 - '--report'
                 - 'json'
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
diff --git a/scanners/kube-hunter/values.yaml b/scanners/kube-hunter/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-kube-hunter
   tag: latest
+
+scannerJob:
+  resources: {}
diff --git a/scanners/nikto/templates/nikto-scan-type.yaml b/scanners/nikto/templates/nikto-scan-type.yaml
@@ -22,3 +22,5 @@ spec:
                 - '/wrapper.sh'
                 - '-o'
                 - '/home/securecodebox/nikto-results.json'
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
diff --git a/scanners/nikto/values.yaml b/scanners/nikto/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-nikto
   tag: latest
+
+scannerJob:
+  resources: {}
diff --git a/scanners/nmap/templates/nmap-scan-type.yaml b/scanners/nmap/templates/nmap-scan-type.yaml
@@ -17,3 +17,5 @@ spec:
             - name: nmap
               image: scbexperimental/nmap:7.80
               command: ["nmap", "-oX", "/home/securecodebox/nmap-results.xml"]
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
diff --git a/scanners/nmap/values.yaml b/scanners/nmap/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-nmap
   tag: latest
+
+scannerJob:
+  resources: {}
diff --git a/scanners/ssh_scan/templates/ssh-scan-scan-type.yaml b/scanners/ssh_scan/templates/ssh-scan-scan-type.yaml
@@ -20,3 +20,5 @@ spec:
                 - "/app/bin/ssh_scan"
                 - "--output"
                 - "/home/securecodebox/ssh-scan-results.json"
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
diff --git a/scanners/ssh_scan/values.yaml b/scanners/ssh_scan/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-ssh-scan
   tag: latest
+
+scannerJob:
+  resources: {}
diff --git a/scanners/sslyze/templates/sslyze-scan-type.yaml b/scanners/sslyze/templates/sslyze-scan-type.yaml
@@ -19,3 +19,5 @@ spec:
                 - 'sslyze'
                 - '--json_out'
                 - '/home/securecodebox/sslyze-results.json'
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
diff --git a/scanners/sslyze/values.yaml b/scanners/sslyze/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-sslyze
   tag: latest
+
+scannerJob:
+  resources: {}
diff --git a/scanners/test-scan/templates/test-scan-scan-type.yaml b/scanners/test-scan/templates/test-scan-scan-type.yaml
@@ -17,3 +17,5 @@ spec:
             - name: test-scan
               image: scbexperimental/test-scan:latest
               command: ["touch", "/home/securecodebox/hello-world.txt"]
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
diff --git a/scanners/test-scan/values.yaml b/scanners/test-scan/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-test-scan
   tag: latest
+
+scannerJob:
+  resources: {}
diff --git a/scanners/trivy/templates/trivy-scan-type.yaml b/scanners/trivy/templates/trivy-scan-type.yaml
@@ -24,3 +24,5 @@ spec:
                 - "json"
                 - "--output"
                 - "/home/securecodebox/trivy-results.json"
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
diff --git a/scanners/trivy/values.yaml b/scanners/trivy/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-trivy
   tag: latest
+
+scannerJob:
+  resources: {}
diff --git a/scanners/wpscan/templates/wpscan-scan-type.yaml b/scanners/wpscan/templates/wpscan-scan-type.yaml
@@ -21,4 +21,6 @@ spec:
                 - "-o"
                 - "/home/securecodebox/wpscan-results.json"
                 - "-f"
-                - json
+                - json
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
diff --git a/scanners/wpscan/values.yaml b/scanners/wpscan/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-wpscan
   tag: latest
+
+scannerJob:
+  resources: {}
diff --git a/scanners/zap/templates/zap-scan-type.yaml b/scanners/zap/templates/zap-scan-type.yaml
@@ -26,6 +26,8 @@ spec:
               volumeMounts:
                 - mountPath: /zap/wrk
                   name: zap-workdir
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
           volumes:
             - name: zap-workdir
               emptyDir: {}
@@ -58,6 +60,8 @@ spec:
               volumeMounts:
                 - mountPath: /zap/wrk
                   name: zap-workdir
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
           volumes:
             - name: zap-workdir
               emptyDir: {}
@@ -90,6 +94,8 @@ spec:
               volumeMounts:
                 - mountPath: /zap/wrk
                   name: zap-workdir
+              resources:
+                {{- toYaml .Values.scannerJob.resources | nindent 16 }}
           volumes:
             - name: zap-workdir
               emptyDir: {}
diff --git a/scanners/zap/values.yaml b/scanners/zap/values.yaml
@@ -2,3 +2,6 @@ parserImage:
   registry: docker.io
   repository: scbexperimental/parser-zap
   tag: latest
+
+scannerJob:
+  resources: {}
