Merge pull request #150 from rancher/dev (614e8f18) · Commits · Joe Mayer / system-charts

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,11 @@ data:
		value: /tmp/results
		- name: CHROOT_DIR
		value: /node
		{{- if .Values.debug }}
		{{- if .Values.overrideBenchmarkVersion }}
		- name: OVERRIDE_BENCHMARK_VERSION
		value: {{ .Values.overrideBenchmarkVersion }}
		{{- end }}
		{{- if .Values.debugWorker }}
		- name: DEBUG
		value: "true"
		- name: DEBUG_TIME_IN_SEC

+10 −2

Original line number	Diff line number	Diff line
		@@ -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
		@@ -46,6 +48,12 @@ spec:
		- name: OUTPUT_CONFIGMAPNAME
		value: {{ .Release.Name }}
		{{- end }}
		{{- if .Values.debugMaster }}
		- name: DEBUG
		value: "true"
		- name: DEBUG_TIME_IN_SEC
		value: {{ .Values.debugTime }}
		{{- end }}
		image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
		imagePullPolicy: {{ .Values.image.pullPolicy }}
		ports:

+6 −4

Original line number	Diff line number	Diff line
		@@ -6,19 +6,21 @@ 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
		debug: false
		debugMaster: false
		debugWorker: false
		debugTime: "infinity"

		image:
		repository: rancher/security-scan
		tag: v0.1.2
		tag: v0.1.6
		pullPolicy: Always

		nameOverride: ""

+1 −1

+1 −1