adding override bechmark version option for cis scan

charts/rancher-cis-benchmark/v0.0.1/templates/configmap.yaml

@@ -87,6 +87,10 @@ data:
         value: /tmp/results
       - name: CHROOT_DIR
         value: /node
+      {{- if .Values.overrideBenchmarkVersion }}
+      - name: OVERRIDE_BENCHMARK_VERSION
+        value: {{ .Values.overrideBenchmarkVersion }}
+      {{- end }}
       {{- if .Values.debugWorker }}
       - name: DEBUG
         value: "true"

charts/rancher-cis-benchmark/v0.0.1/templates/pod.yaml

@@ -32,8 +32,10 @@ spec:
     - name: {{ .Chart.Name }}
       restartPolicy: Never
       env:
-        - name: SKIP
-          value: {{ .Values.skip }}
+        {{- if .Values.overrideBenchmarkVersion }}
+        - name: OVERRIDE_BENCHMARK_VERSION
+          value: {{ .Values.overrideBenchmarkVersion }}
+        {{- end }}
         - name: SONOBUOY_NS
           value: {{ .Release.Namespace }}
         - name: SONOBUOY_POD_NAME

charts/rancher-cis-benchmark/v0.0.1/values.yaml

@@ -6,11 +6,12 @@ replicaCount: 1
 
 # if owner is specified, it's used for the name of the configmap for results
 owner: ""
-# skip is used specify which tests to skip
-skip: ""
 # skipConfigMapName is used to specify the name of cm where the skip info is stored
 # skip has higher precedence than what's specified in the configmap
 skipConfigMapName: ""
+# overrideBenchmarkVersion is used to override the default benchmark version used for
+# a particular k8s version
+overrideBenchmarkVersion: ""
 
 # when debug=true, the plugin pods sleep for the time specified
 debugMaster: false