Unverified Commit 614e8f18 authored by Denise's avatar Denise Committed by GitHub
Browse files

Merge pull request #150 from rancher/dev 

v2.3.4
parents 813e2e4e f2a33b9b

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,11 @@ data: 
        value: /tmp/results

        value: /tmp/results

      - name: CHROOT_DIR

      - name: CHROOT_DIR

        value: /node

        value: /node

      {{- if .Values.debug }}

      {{- if .Values.overrideBenchmarkVersion }}

      - name: OVERRIDE_BENCHMARK_VERSION

        value: {{ .Values.overrideBenchmarkVersion }}

      {{- end }}

      {{- if .Values.debugWorker }}

      - name: DEBUG

      - name: DEBUG

        value: "true"

        value: "true"

      - name: DEBUG_TIME_IN_SEC

      - name: DEBUG_TIME_IN_SEC

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

+10 −2
Original line number Original line Diff line number Diff line
@@ -32,8 +32,10 @@ spec: 
    - name: {{ .Chart.Name }}

    - name: {{ .Chart.Name }}

      restartPolicy: Never

      restartPolicy: Never

      env:

      env:

        - name: SKIP

        {{- if .Values.overrideBenchmarkVersion }}

          value: {{ .Values.skip }}

        - name: OVERRIDE_BENCHMARK_VERSION

          value: {{ .Values.overrideBenchmarkVersion }}

        {{- end }}

        - name: SONOBUOY_NS

        - name: SONOBUOY_NS

          value: {{ .Release.Namespace }}

          value: {{ .Release.Namespace }}

        - name: SONOBUOY_POD_NAME

        - name: SONOBUOY_POD_NAME
@@ -46,6 +48,12 @@ spec: 
        - name: OUTPUT_CONFIGMAPNAME

        - name: OUTPUT_CONFIGMAPNAME

          value: {{ .Release.Name }}

          value: {{ .Release.Name }}

        {{- end }}

        {{- end }}

        {{- if .Values.debugMaster }}

        - name: DEBUG

          value: "true"

        - name: DEBUG_TIME_IN_SEC

          value: {{ .Values.debugTime }}

        {{- end }}

      image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

      image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

      imagePullPolicy: {{ .Values.image.pullPolicy }}

      imagePullPolicy: {{ .Values.image.pullPolicy }}

      ports:

      ports:

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

+6 −4
Original line number Original line 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

# if owner is specified, it's used for the name of the configmap for results

owner: ""

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

# 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

# skip has higher precedence than what's specified in the configmap

skipConfigMapName: ""

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

# when debug=true, the plugin pods sleep for the time specified

debug: false

debugMaster: false

debugWorker: false

debugTime: "infinity"

debugTime: "infinity"





image:

image:

  repository: rancher/security-scan

  repository: rancher/security-scan

  tag: v0.1.2

  tag: v0.1.6

  pullPolicy: Always

  pullPolicy: Always





nameOverride: ""

nameOverride: ""

charts/rancher-istio/0.1.0/questions.yml

+1 −1
Original line number Original line Diff line number Diff line 
labels:

labels:

  rancher.istio.v0.1.0: 1.3.1

  rancher.istio.v0.1.0: 1.3.1

rancher_min_version: 2.3.0-rc1

rancher_min_version: 2.3.0-rc1

rancher_max_version: 2.3.3

charts/rancher-istio/0.1.1/questions.yml

+1 −1
Original line number Original line Diff line number Diff line 
labels:

labels:

  rancher.istio.v0.1.1: 1.3.3

  rancher.istio.v0.1.1: 1.3.3

rancher_min_version: 2.3.0-rc1

rancher_min_version: 2.3.0-rc1

rancher_max_version: 2.3.3