From 1a83ec8f6a0f6971dd9b35ee16e0c894f3e7cd7c Mon Sep 17 00:00:00 2001 From: actions Date: Mon, 12 Apr 2021 17:32:39 +0000 Subject: [PATCH] Merge pull request #1105 from MonzElmasry/fix_chart_version fix rancher-cis-benchmark chart version --- .../rancher-cis-benchmark-1.0.400-rc02.tgz | Bin 0 -> 4950 bytes ...rancher-cis-benchmark-crd-1.0.400-rc02.tgz | Bin 0 -> 1452 bytes .../1.0.400-rc02/Chart.yaml | 10 ++ .../1.0.400-rc02/README.md | 2 + .../1.0.400-rc02/templates/clusterscan.yaml | 149 ++++++++++++++++++ .../templates/clusterscanbenchmark.yaml | 55 +++++++ .../templates/clusterscanprofile.yaml | 37 +++++ .../templates/clusterscanreport.yaml | 40 +++++ .../1.0.400-rc02/Chart.yaml | 18 +++ .../1.0.400-rc02/README.md | 9 ++ .../1.0.400-rc02/app-readme.md | 15 ++ .../1.0.400-rc02/templates/_helpers.tpl | 23 +++ .../1.0.400-rc02/templates/alertingrule.yaml | 14 ++ .../templates/benchmark-cis-1.5.yaml | 8 + .../templates/benchmark-cis-1.6.yaml | 8 + .../templates/benchmark-eks-1.0.yaml | 8 + .../templates/benchmark-gke-1.0.yaml | 8 + .../benchmark-rke-cis-1.5-hardened.yaml | 8 + .../benchmark-rke-cis-1.5-permissive.yaml | 8 + .../benchmark-rke-cis-1.6-hardened.yaml | 8 + .../benchmark-rke-cis-1.6-permissive.yaml | 8 + .../benchmark-rke2-cis-1.5-hardened.yaml | 8 + .../benchmark-rke2-cis-1.5-permissive.yaml | 8 + .../benchmark-rke2-cis-1.6-hardened.yaml | 8 + .../benchmark-rke2-cis-1.6-permissive.yaml | 8 + .../1.0.400-rc02/templates/cis-roles.yaml | 49 ++++++ .../1.0.400-rc02/templates/configmap.yaml | 16 ++ .../1.0.400-rc02/templates/deployment.yaml | 57 +++++++ .../templates/network_policy_allow_all.yaml | 15 ++ .../patch_default_serviceaccount.yaml | 20 +++ .../1.0.400-rc02/templates/rbac.yaml | 43 +++++ .../templates/scanprofile-cis-1.5.yml | 9 ++ .../templates/scanprofile-cis-1.6.yaml | 9 ++ .../scanprofile-rke-1.5-hardened.yml | 9 ++ .../scanprofile-rke-1.5-permissive.yml | 9 ++ .../scanprofile-rke-1.6-hardened.yaml | 9 ++ .../scanprofile-rke-1.6-permissive.yaml | 9 ++ .../scanprofile-rke2-cis-1.5-hardened.yml | 9 ++ .../scanprofile-rke2-cis-1.5-permissive.yml | 9 ++ .../scanprofile-rke2-cis-1.6-hardened.yml | 9 ++ .../scanprofile-rke2-cis-1.6-permissive.yml | 9 ++ .../1.0.400-rc02/templates/scanprofileeks.yml | 9 ++ .../1.0.400-rc02/templates/scanprofilegke.yml | 9 ++ .../templates/serviceaccount.yaml | 14 ++ .../templates/validate-install-crd.yaml | 17 ++ .../1.0.400-rc02/values.yaml | 45 ++++++ index.yaml | 36 +++++ 47 files changed, 888 insertions(+) create mode 100755 assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.400-rc02.tgz create mode 100755 assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-1.0.400-rc02.tgz create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.400-rc02/Chart.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.400-rc02/README.md create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.400-rc02/templates/clusterscan.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.400-rc02/templates/clusterscanbenchmark.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.400-rc02/templates/clusterscanprofile.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.400-rc02/templates/clusterscanreport.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/Chart.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/README.md create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/app-readme.md create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/_helpers.tpl create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/alertingrule.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-cis-1.5.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-cis-1.6.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-eks-1.0.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-gke-1.0.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-rke-cis-1.5-hardened.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-rke-cis-1.5-permissive.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-rke-cis-1.6-hardened.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-rke-cis-1.6-permissive.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-rke2-cis-1.5-hardened.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-rke2-cis-1.5-permissive.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-rke2-cis-1.6-hardened.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/benchmark-rke2-cis-1.6-permissive.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/cis-roles.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/configmap.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/deployment.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/network_policy_allow_all.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/patch_default_serviceaccount.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/rbac.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-cis-1.5.yml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-cis-1.6.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.5-hardened.yml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.5-permissive.yml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.6-hardened.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.6-permissive.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.5-hardened.yml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.5-permissive.yml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.6-hardened.yml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.6-permissive.yml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofileeks.yml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofilegke.yml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/serviceaccount.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/validate-install-crd.yaml create mode 100755 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/values.yaml diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.400-rc02.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.400-rc02.tgz new file mode 100755 index 0000000000000000000000000000000000000000..50311281ca517aa051ff1320fa8093b473decfd1 GIT binary patch literal 4950 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.16.0: rke-profile-permissive-1.6 + rke2: |- + <1.20.0: rke2-cis-1.5-profile-permissive + >=1.20.0: rke2-cis-1.6-profile-permissive + eks: "eks-profile" + gke: "gke-profile" + default: "cis-1.6-profile" diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/deployment.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/deployment.yaml new file mode 100755 index 000000000..0d3c75e39 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/deployment.yaml @@ -0,0 +1,57 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cis-operator + namespace: {{ template "cis.namespace" . }} + labels: + cis.cattle.io/operator: cis-operator +spec: + selector: + matchLabels: + cis.cattle.io/operator: cis-operator + template: + metadata: + labels: + cis.cattle.io/operator: cis-operator + spec: + serviceAccountName: cis-operator-serviceaccount + containers: + - name: cis-operator + image: '{{ template "system_default_registry" . }}{{ .Values.image.cisoperator.repository }}:{{ .Values.image.cisoperator.tag }}' + imagePullPolicy: Always + ports: + - name: cismetrics + containerPort: {{ .Values.alerts.metricsPort }} + env: + - name: SECURITY_SCAN_IMAGE + value: {{ template "system_default_registry" . }}{{ .Values.image.securityScan.repository }} + - name: SECURITY_SCAN_IMAGE_TAG + value: {{ .Values.image.securityScan.tag }} + - name: SONOBUOY_IMAGE + value: {{ template "system_default_registry" . }}{{ .Values.image.sonobuoy.repository }} + - name: SONOBUOY_IMAGE_TAG + value: {{ .Values.image.sonobuoy.tag }} + - name: CIS_ALERTS_METRICS_PORT + value: '{{ .Values.alerts.metricsPort }}' + - name: CIS_ALERTS_SEVERITY + value: {{ .Values.alerts.severity }} + - name: CIS_ALERTS_ENABLED + value: {{ .Values.alerts.enabled | default "false" | quote }} + - name: CLUSTER_NAME + value: {{ .Values.global.cattle.clusterName }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + nodeSelector: + kubernetes.io/os: linux + {{- with .Values.nodeSelector }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + tolerations: + {{- include "linux_node_tolerations" . | nindent 8}} + {{- with .Values.tolerations }} + {{- toYaml . | nindent 8 }} + {{- end }} \ No newline at end of file diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/network_policy_allow_all.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/network_policy_allow_all.yaml new file mode 100755 index 000000000..6ed5d645e --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/network_policy_allow_all.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: default-allow-all + namespace: {{ template "cis.namespace" . }} +spec: + podSelector: {} + ingress: + - {} + egress: + - {} + policyTypes: + - Ingress + - Egress diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/patch_default_serviceaccount.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/patch_default_serviceaccount.yaml new file mode 100755 index 000000000..1efa3ed1c --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/patch_default_serviceaccount.yaml @@ -0,0 +1,20 @@ +--- +apiVersion: batch/v1 +kind: Job +metadata: + name: patch-sa + annotations: + "helm.sh/hook": post-install, post-upgrade + "helm.sh/hook-delete-policy": hook-succeeded, before-hook-creation +spec: + template: + spec: + serviceAccountName: cis-operator-serviceaccount + restartPolicy: Never + containers: + - name: sa + image: "{{ template "system_default_registry" . }}{{ .Values.global.kubectl.repository }}:{{ .Values.global.kubectl.tag }}" + imagePullPolicy: {{ .Values.global.imagePullPolicy }} + command: ["kubectl", "patch", "serviceaccount", "default", "-p", "{\"automountServiceAccountToken\": false}"] + args: ["-n", {{ template "cis.namespace" . }}] + backoffLimit: 1 diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/rbac.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/rbac.yaml new file mode 100755 index 000000000..816991f23 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/rbac.yaml @@ -0,0 +1,43 @@ +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/name: rancher-cis-benchmark + app.kubernetes.io/instance: release-name + name: cis-operator-role +rules: +- apiGroups: + - '*' + resources: + - '*' + verbs: + - '*' +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRoleBinding +metadata: + labels: + app.kubernetes.io/name: rancher-cis-benchmark + app.kubernetes.io/instance: release-name + name: cis-operator-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: cis-operator-role +subjects: +- kind: ServiceAccount + name: cis-serviceaccount + namespace: {{ template "cis.namespace" . }} +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: cis-operator-installer +subjects: +- kind: ServiceAccount + name: cis-operator-serviceaccount + namespace: {{ template "cis.namespace" . }} +roleRef: + kind: ClusterRole + name: cluster-admin + apiGroup: rbac.authorization.k8s.io \ No newline at end of file diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-cis-1.5.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-cis-1.5.yml new file mode 100755 index 000000000..d69ae9dd5 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-cis-1.5.yml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: cis-1.5-profile + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: cis-1.5 diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-cis-1.6.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-cis-1.6.yaml new file mode 100755 index 000000000..8a8d8bf88 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-cis-1.6.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: cis-1.6-profile + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: cis-1.6 diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.5-hardened.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.5-hardened.yml new file mode 100755 index 000000000..4eabe158a --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.5-hardened.yml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: rke-profile-hardened-1.5 + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: rke-cis-1.5-hardened \ No newline at end of file diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.5-permissive.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.5-permissive.yml new file mode 100755 index 000000000..1f78751d1 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.5-permissive.yml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: rke-profile-permissive-1.5 + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: rke-cis-1.5-permissive diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.6-hardened.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.6-hardened.yaml new file mode 100755 index 000000000..d38febd80 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.6-hardened.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: rke-profile-hardened-1.6 + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: rke-cis-1.6-hardened diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.6-permissive.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.6-permissive.yaml new file mode 100755 index 000000000..d31b5b0d2 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke-1.6-permissive.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: rke-profile-permissive-1.6 + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: rke-cis-1.6-permissive diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.5-hardened.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.5-hardened.yml new file mode 100755 index 000000000..83eb3131e --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.5-hardened.yml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: rke2-cis-1.5-profile-hardened + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: rke2-cis-1.5-hardened diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.5-permissive.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.5-permissive.yml new file mode 100755 index 000000000..40dc44bdf --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.5-permissive.yml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: rke2-cis-1.5-profile-permissive + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: rke2-cis-1.5-permissive diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.6-hardened.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.6-hardened.yml new file mode 100755 index 000000000..c7ac7f949 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.6-hardened.yml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: rke2-cis-1.6-profile-hardened + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: rke2-cis-1.6-hardened diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.6-permissive.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.6-permissive.yml new file mode 100755 index 000000000..96ca1345a --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofile-rke2-cis-1.6-permissive.yml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: rke2-cis-1.6-profile-permissive + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: rke2-cis-1.6-permissive diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofileeks.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofileeks.yml new file mode 100755 index 000000000..49c7e0246 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofileeks.yml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: eks-profile + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: eks-1.0 \ No newline at end of file diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofilegke.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofilegke.yml new file mode 100755 index 000000000..2ddd0686f --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/scanprofilegke.yml @@ -0,0 +1,9 @@ +--- +apiVersion: cis.cattle.io/v1 +kind: ClusterScanProfile +metadata: + name: gke-profile + annotations: + clusterscanprofile.cis.cattle.io/builtin: "true" +spec: + benchmarkVersion: gke-1.0 \ No newline at end of file diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/serviceaccount.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/serviceaccount.yaml new file mode 100755 index 000000000..ec48ec622 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/serviceaccount.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + namespace: {{ template "cis.namespace" . }} + name: cis-operator-serviceaccount +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + namespace: {{ template "cis.namespace" . }} + labels: + app.kubernetes.io/name: rancher-cis-benchmark + app.kubernetes.io/instance: release-name + name: cis-serviceaccount diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/validate-install-crd.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/validate-install-crd.yaml new file mode 100755 index 000000000..562295791 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/templates/validate-install-crd.yaml @@ -0,0 +1,17 @@ +#{{- if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 -}} +# {{- $found := dict -}} +# {{- set $found "cis.cattle.io/v1/ClusterScan" false -}} +# {{- set $found "cis.cattle.io/v1/ClusterScanBenchmark" false -}} +# {{- set $found "cis.cattle.io/v1/ClusterScanProfile" false -}} +# {{- set $found "cis.cattle.io/v1/ClusterScanReport" false -}} +# {{- range .Capabilities.APIVersions -}} +# {{- if hasKey $found (toString .) -}} +# {{- set $found (toString .) true -}} +# {{- end -}} +# {{- end -}} +# {{- range $_, $exists := $found -}} +# {{- if (eq $exists false) -}} +# {{- required "Required CRDs are missing. Please install the corresponding CRD chart before installing this chart." "" -}} +# {{- end -}} +# {{- end -}} +#{{- end -}} \ No newline at end of file diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/values.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/values.yaml new file mode 100755 index 000000000..ff4a49495 --- /dev/null +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.400-rc02/values.yaml @@ -0,0 +1,45 @@ +# Default values for rancher-cis-benchmark. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +image: + cisoperator: + repository: rancher/cis-operator + tag: v1.0.4-rc1 + securityScan: + repository: rancher/security-scan + tag: v0.2.3-rc1 + sonobuoy: + repository: rancher/mirrored-sonobuoy-sonobuoy + tag: v0.16.3 + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +nodeSelector: {} + +tolerations: [] + +affinity: {} + +global: + cattle: + systemDefaultRegistry: "" + clusterName: "" + kubectl: + repository: rancher/kubectl + tag: v1.20.2 + +alerts: + enabled: false + severity: warning + metricsPort: 8080 diff --git a/index.yaml b/index.yaml index fd35a2206..9fe186a97 100755 --- a/index.yaml +++ b/index.yaml @@ -2061,6 +2061,28 @@ entries: urls: - assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.402-rc00.tgz version: 1.0.402-rc00 + - annotations: + catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match + catalog.cattle.io/certified: rancher + catalog.cattle.io/display-name: CIS Benchmark + catalog.cattle.io/namespace: cis-operator-system + catalog.cattle.io/os: linux + catalog.cattle.io/provides-gvr: cis.cattle.io.clusterscans/v1 + catalog.cattle.io/release-name: rancher-cis-benchmark + catalog.cattle.io/ui-component: rancher-cis-benchmark + apiVersion: v1 + appVersion: v1.0.4 + created: "2021-04-12T17:32:38.628448061Z" + description: The cis-operator enables running CIS benchmark security scans on + a kubernetes cluster + digest: ddf0cd7c9e58100f761681ea9f2e9b7a0961022e63b06241ccc6e4df3e37ae96 + icon: https://charts.rancher.io/assets/logos/cis-kube-bench.svg + keywords: + - security + name: rancher-cis-benchmark + urls: + - assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.400-rc02.tgz + version: 1.0.400-rc02 - annotations: catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match catalog.cattle.io/certified: rancher @@ -2229,6 +2251,20 @@ entries: urls: - assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-1.0.402-rc00.tgz version: 1.0.402-rc00 + - annotations: + catalog.cattle.io/certified: rancher + catalog.cattle.io/hidden: "true" + catalog.cattle.io/namespace: cis-operator-system + catalog.cattle.io/release-name: rancher-cis-benchmark-crd + apiVersion: v1 + created: "2021-04-12T17:32:38.630282571Z" + description: Installs the CRDs for rancher-cis-benchmark. + digest: 2b98b8d77b68abf963f8170f3cda7bb4f7bb71c8a7489769ae09b81e1f9530e6 + name: rancher-cis-benchmark-crd + type: application + urls: + - assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-1.0.400-rc02.tgz + version: 1.0.400-rc02 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true"