Delete tgz files from assets, parameter in the post-install hook for namespace should use the

helm templating

packages/rancher-cis-benchmark/charts/templates/patch_default_serviceaccount.yaml

@@ -5,7 +5,7 @@ metadata:
   name: patch-sa
   annotations:
     "helm.sh/hook": post-install, post-upgrade
-    "helm.sh/hook-delete-policy": hook-succeeded, before-hook-creation, hook-failed
+    "helm.sh/hook-delete-policy": hook-succeeded, before-hook-creation
 spec:
   template:
     spec:
@@ -15,5 +15,6 @@ spec:
       - name: sa
         image: "{{ template "system_default_registry" . }}{{ .Values.global.kubectl.repository }}:{{ .Values.global.kubectl.tag }}"
         imagePullPolicy: {{ .Values.global.imagePullPolicy }}
-        command: ["kubectl", "patch", "serviceaccount", "-n", "cis-operator-system", "default", "-p", "{\"automountServiceAccountToken\": false}"]
+        command: ["kubectl", "patch", "serviceaccount", "default", "-p", "{\"automountServiceAccountToken\": false}"]
+        args: ["-n", {{ template "cis.namespace" . }}]
   backoffLimit: 1

packages/rancher-cis-benchmark/charts/values.yaml

@@ -35,5 +35,5 @@ global:
   cattle:
     systemDefaultRegistry: ""
   kubectl:
-    repository: rancher/istio-kubectl
-    tag: 1.4.6
+    repository: rancher/kubectl
+    tag: v1.18.6