From 2888b5982a69a49f63b025994aeea8bd48623c6a Mon Sep 17 00:00:00 2001
From: dhruvmewada15 <dhruvmewada@outlook.com>
Date: Tue, 3 May 2022 14:19:34 +0530
Subject: [PATCH] make charts

---
 .../rancher-cis-benchmark-crd-2.0.4-rc1.tgz   | Bin 0 -> 1466 bytes
 .../rancher-cis-benchmark-2.0.4-rc1.tgz       | Bin 0 -> 5310 bytes
 .../2.0.4-rc1/Chart.yaml                      |  10 ++
 .../2.0.4-rc1/README.md                       |   2 +
 .../2.0.4-rc1/templates/clusterscan.yaml      | 148 ++++++++++++++++++
 .../templates/clusterscanbenchmark.yaml       |  54 +++++++
 .../templates/clusterscanprofile.yaml         |  36 +++++
 .../templates/clusterscanreport.yaml          |  39 +++++
 .../2.0.4-rc1/Chart.yaml                      |  22 +++
 .../rancher-cis-benchmark/2.0.4-rc1/README.md |   9 ++
 .../2.0.4-rc1/app-readme.md                   |  15 ++
 .../2.0.4-rc1/templates/_helpers.tpl          |  27 ++++
 .../2.0.4-rc1/templates/alertingrule.yaml     |  14 ++
 .../templates/benchmark-aks-1.0.yaml          |   8 +
 .../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-k3s-cis-1.6-hardened.yaml       |   8 +
 .../benchmark-k3s-cis-1.6-permissive.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 +
 .../2.0.4-rc1/templates/cis-roles.yaml        |  49 ++++++
 .../2.0.4-rc1/templates/configmap.yaml        |  18 +++
 .../2.0.4-rc1/templates/deployment.yaml       |  55 +++++++
 .../templates/network_policy_allow_all.yaml   |  15 ++
 .../patch_default_serviceaccount.yaml         |  29 ++++
 .../2.0.4-rc1/templates/rbac.yaml             |  43 +++++
 .../templates/scanprofile-cis-1.5.yml         |   9 ++
 .../templates/scanprofile-cis-1.6.yaml        |   9 ++
 .../scanprofile-k3s-cis-1.6-hardened.yml      |   9 ++
 .../scanprofile-k3s-cis-1.6-permissive.yml    |   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 ++
 .../2.0.4-rc1/templates/scanprofileaks.yml    |   9 ++
 .../2.0.4-rc1/templates/scanprofileeks.yml    |   9 ++
 .../2.0.4-rc1/templates/scanprofilegke.yml    |   9 ++
 .../2.0.4-rc1/templates/serviceaccount.yaml   |  14 ++
 .../templates/validate-install-crd.yaml       |  17 ++
 .../2.0.4-rc1/values.yaml                     |  49 ++++++
 index.yaml                                    |  40 +++++
 53 files changed, 960 insertions(+)
 create mode 100644 assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.0.4-rc1.tgz
 create mode 100644 assets/rancher-cis-benchmark/rancher-cis-benchmark-2.0.4-rc1.tgz
 create mode 100644 charts/rancher-cis-benchmark-crd/2.0.4-rc1/Chart.yaml
 create mode 100644 charts/rancher-cis-benchmark-crd/2.0.4-rc1/README.md
 create mode 100644 charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscan.yaml
 create mode 100644 charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanbenchmark.yaml
 create mode 100644 charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanprofile.yaml
 create mode 100644 charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanreport.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/Chart.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/README.md
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/app-readme.md
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/_helpers.tpl
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/alertingrule.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-aks-1.0.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-cis-1.5.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-cis-1.6.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-eks-1.0.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-gke-1.0.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-k3s-cis-1.6-hardened.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-k3s-cis-1.6-permissive.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.5-hardened.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.5-permissive.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.6-hardened.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.6-permissive.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.5-hardened.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.5-permissive.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.6-hardened.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.6-permissive.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/cis-roles.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/configmap.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/deployment.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/network_policy_allow_all.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/patch_default_serviceaccount.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/rbac.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-cis-1.5.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-cis-1.6.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-k3s-cis-1.6-hardened.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-k3s-cis-1.6-permissive.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke-1.5-hardened.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke-1.5-permissive.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke-1.6-hardened.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke-1.6-permissive.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke2-cis-1.5-hardened.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke2-cis-1.5-permissive.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke2-cis-1.6-hardened.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke2-cis-1.6-permissive.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofileaks.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofileeks.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofilegke.yml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/serviceaccount.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/templates/validate-install-crd.yaml
 create mode 100644 charts/rancher-cis-benchmark/2.0.4-rc1/values.yaml

diff --git a/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.0.4-rc1.tgz b/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.0.4-rc1.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..6861b72ee75c9060702808b44cf54fc53b574008
GIT binary patch
literal 1466
zcmV;r1x5NFiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PI>(bK*7-&NIJ4bA85V10fyWa@@6ZZ7-K0>GgS$H=v6xd8BoE
zOsD_7BijkKu`vciu5;`QgCu_|+24LEt*t@wCF(vGrawo?mm%oKKG*)+=@K+KD+q&&
z1I=|^cRU&;zpm?+f8EQ$=)xNfh9hr08efesTyN~T!wcpf>UbB64S~LJ5B61F-2cQt
zN<~0INi*p&#(^ME3x@+yfR0daIcgFQ0{scgxKcT6DSRL0guNjh<D1GM5<)Z)aGWs9
zHWi@;Qo3(ehA^zWL}P$pux~GY@xRH{9z@~`Y9o}KuqUtQqv2Xal>GlF4M7kXMoVPV
z*?Yqtl&;2ddQFaK72$+I6a|7OcdhsI?04X}&Zw`s*L&?}+Q#bRpD>I9AT)1z5F0{m
zILN*9V0-*~?!fbk@jvi}WA_~Yr?7nFKqT-Rp|t;u^Z2u|A^7C=9)<KLY#JL<;S7z6
zHOKe(Af!klAVdNm2&{gj@slHrakwz+i0+vPxgEIBDvlB%$aSXICql$n<~4=7;~<mP
zD2O!#MHfBB3|BTVv(Y`qvan3B`q{Leyad9aezJ0Al`3r@rD1`&7V!OKZ4lgQAqn+V
z1#u{|nf2LMqvS2na>5)#K(TQGFf@y$o#(Aq4<f)D2ve}<yOLW<HYDp#Ma7U7a#8ER
z#9;_}<&Yu>3b^;VmR3*^7*jyHT{pA>dH_+J(l6_VRzT)aL<OL`bwewlzd_3a&|m9@
zRzOnGb*lFBp!hg%6tRu2ov<^m+=~zmL0DYzAJv@=z!7rC@Fn_jfWBqeRLKXiaJW|T
zE^9B6akFE?g^A}n3-^rqHdgEsChVVo(;<9`Av|}g2<7$d$1lUXLNjBLw%MM<8Yj6p
z(}J~Ck4qgD0;}B3n2dwKK8Rct=WSzgdFYM%)*8Nk;@0v{p{l<TzF`H{G!jaySyL5D
zs`ipXSV3DPB3U+jldl8RG&^LX+wX-nus%M^sS2Y2sm9ZK!gHkp1i2l|N=~c~!b(S|
z`B&srL!in|!<9xWFhW)^2W1>?w)R<0ee=yZEnVBb<gS@?7Q{P--VJ^u8yeRYtlB^7
z?w+|O<igUe>!{{Rra8QVg@Q1wBxe(Kt#aRMkS0O48ePY?9pa=hq*H%?Mm`W8-&csn
z*j><3ooEE3<Z*pevAb&@$$%qz*eXRk1qEmgt5TmYOccPX<Lri7E4?k@)NAfm&K;f;
zEfbCgPA@u8Df_H(`CFcG^=YC@c`WZiyTn%W^oaE<O4Lb}WD|YcRwUbdcT7{8Sohl&
z70v+rLD*!!=br3QR6Lwru1rpf`(0{}Py1Y1OX<pvLgQ-}LVi$dS^ry?N?Q~H8|wdq
ztI@br{~Hc2y>tEV6n5<T-wR<nECjxL#!R{^DuQdLuUi_7kUQD5Znb(6{)=Q5DuSiH
z9ZEf+kiW-s)Dj6z_WTOSpXvwf0uSFB;OhtM0M8R9y*$OV<njrkjf&|G0}phUypP)1
zXMXf|T`en-uG4e%miu!mKj~Y<4xLpIzEk{)aO@8Mkj+)g{2!&Kk#?^E8}h$*IT)7m
z|KMtLb<Y2%uw&={j4&N$|NOhNiroL~u=~vaJqi3vs2)MA?1}Rp4YetpHkMPi7E|^t
zXf^8|+hfC4zO{wj!Mp0t!s=c-q+3}_{nr?&)?bA+>HqlhvaJ8(;raWIli0EKKP60u
z@;^%e>(oDU_xi`aBfaB4Se)1ol*o=*<4%e8+ui4z6Yk@W5dZc1Kl^a~{?i91^bhvY
z^!=|l8kD~Oy&MhC^}mzYPg_2Ay=JqtkMSjFVzdNeV&ik#*r3nmtGZ8WUwegTJKNdL
UcD5?}F8~1l|GJzGdH^&40EsTw!~g&Q

literal 0
HcmV?d00001

diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-2.0.4-rc1.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-2.0.4-rc1.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..4b9c37367d6a088d7c03d80cd4402db61d3f028d
GIT binary patch
literal 5310
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
IGZYm61B8miGXMYp

literal 0
HcmV?d00001

diff --git a/charts/rancher-cis-benchmark-crd/2.0.4-rc1/Chart.yaml b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/Chart.yaml
new file mode 100644
index 000000000..55c83e022
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/Chart.yaml
@@ -0,0 +1,10 @@
+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
+description: Installs the CRDs for rancher-cis-benchmark.
+name: rancher-cis-benchmark-crd
+type: application
+version: 2.0.4-rc1
diff --git a/charts/rancher-cis-benchmark-crd/2.0.4-rc1/README.md b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/README.md
new file mode 100644
index 000000000..f6d9ef621
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/README.md
@@ -0,0 +1,2 @@
+# rancher-cis-benchmark-crd
+A Rancher chart that installs the CRDs used by rancher-cis-benchmark.
diff --git a/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscan.yaml b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscan.yaml
new file mode 100644
index 000000000..3cbb0ffcd
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscan.yaml
@@ -0,0 +1,148 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterscans.cis.cattle.io
+spec:
+  group: cis.cattle.io
+  names:
+    kind: ClusterScan
+    plural: clusterscans
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .status.lastRunScanProfileName
+      name: ClusterScanProfile
+      type: string
+    - jsonPath: .status.summary.total
+      name: Total
+      type: string
+    - jsonPath: .status.summary.pass
+      name: Pass
+      type: string
+    - jsonPath: .status.summary.fail
+      name: Fail
+      type: string
+    - jsonPath: .status.summary.skip
+      name: Skip
+      type: string
+    - jsonPath: .status.summary.warn
+      name: Warn
+      type: string
+    - jsonPath: .status.summary.notApplicable
+      name: Not Applicable
+      type: string
+    - jsonPath: .status.lastRunTimestamp
+      name: LastRunTimestamp
+      type: string
+    - jsonPath: .spec.scheduledScanConfig.cronSchedule
+      name: CronSchedule
+      type: string
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              scanProfileName:
+                nullable: true
+                type: string
+              scheduledScanConfig:
+                nullable: true
+                properties:
+                  cronSchedule:
+                    nullable: true
+                    type: string
+                  retentionCount:
+                    type: integer
+                  scanAlertRule:
+                    nullable: true
+                    properties:
+                      alertOnComplete:
+                        type: boolean
+                      alertOnFailure:
+                        type: boolean
+                    type: object
+                type: object
+              scoreWarning:
+                enum:
+                - pass
+                - fail
+                nullable: true
+                type: string
+            type: object
+          status:
+            properties:
+              NextScanAt:
+                nullable: true
+                type: string
+              ScanAlertingRuleName:
+                nullable: true
+                type: string
+              conditions:
+                items:
+                  properties:
+                    lastTransitionTime:
+                      nullable: true
+                      type: string
+                    lastUpdateTime:
+                      nullable: true
+                      type: string
+                    message:
+                      nullable: true
+                      type: string
+                    reason:
+                      nullable: true
+                      type: string
+                    status:
+                      nullable: true
+                      type: string
+                    type:
+                      nullable: true
+                      type: string
+                  type: object
+                nullable: true
+                type: array
+              display:
+                nullable: true
+                properties:
+                  error:
+                    type: boolean
+                  message:
+                    nullable: true
+                    type: string
+                  state:
+                    nullable: true
+                    type: string
+                  transitioning:
+                    type: boolean
+                type: object
+              lastRunScanProfileName:
+                nullable: true
+                type: string
+              lastRunTimestamp:
+                nullable: true
+                type: string
+              observedGeneration:
+                type: integer
+              summary:
+                nullable: true
+                properties:
+                  fail:
+                    type: integer
+                  notApplicable:
+                    type: integer
+                  pass:
+                    type: integer
+                  skip:
+                    type: integer
+                  total:
+                    type: integer
+                  warn:
+                    type: integer
+                type: object
+            type: object
+        type: object
diff --git a/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanbenchmark.yaml b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanbenchmark.yaml
new file mode 100644
index 000000000..fd291f8c3
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanbenchmark.yaml
@@ -0,0 +1,54 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterscanbenchmarks.cis.cattle.io
+spec:
+  group: cis.cattle.io
+  names:
+    kind: ClusterScanBenchmark
+    plural: clusterscanbenchmarks
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .spec.clusterProvider
+      name: ClusterProvider
+      type: string
+    - jsonPath: .spec.minKubernetesVersion
+      name: MinKubernetesVersion
+      type: string
+    - jsonPath: .spec.maxKubernetesVersion
+      name: MaxKubernetesVersion
+      type: string
+    - jsonPath: .spec.customBenchmarkConfigMapName
+      name: customBenchmarkConfigMapName
+      type: string
+    - jsonPath: .spec.customBenchmarkConfigMapNamespace
+      name: customBenchmarkConfigMapNamespace
+      type: string
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              clusterProvider:
+                nullable: true
+                type: string
+              customBenchmarkConfigMapName:
+                nullable: true
+                type: string
+              customBenchmarkConfigMapNamespace:
+                nullable: true
+                type: string
+              maxKubernetesVersion:
+                nullable: true
+                type: string
+              minKubernetesVersion:
+                nullable: true
+                type: string
+            type: object
+        type: object
diff --git a/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanprofile.yaml b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanprofile.yaml
new file mode 100644
index 000000000..1e75501b7
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanprofile.yaml
@@ -0,0 +1,36 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterscanprofiles.cis.cattle.io
+spec:
+  group: cis.cattle.io
+  names:
+    kind: ClusterScanProfile
+    plural: clusterscanprofiles
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              benchmarkVersion:
+                nullable: true
+                type: string
+              skipTests:
+                items:
+                  nullable: true
+                  type: string
+                nullable: true
+                type: array
+            type: object
+        type: object
+    additionalPrinterColumns:
+    - jsonPath: .spec.benchmarkVersion
+      name: BenchmarkVersion
+      type: string
diff --git a/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanreport.yaml b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanreport.yaml
new file mode 100644
index 000000000..6e8c0b7de
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.0.4-rc1/templates/clusterscanreport.yaml
@@ -0,0 +1,39 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: clusterscanreports.cis.cattle.io
+spec:
+  group: cis.cattle.io
+  names:
+    kind: ClusterScanReport
+    plural: clusterscanreports
+  scope: Cluster
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    additionalPrinterColumns:
+    - jsonPath: .spec.lastRunTimestamp
+      name: LastRunTimestamp
+      type: string
+    - jsonPath: .spec.benchmarkVersion
+      name: BenchmarkVersion
+      type: string
+    subresources:
+      status: {}
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            properties:
+              benchmarkVersion:
+                nullable: true
+                type: string
+              lastRunTimestamp:
+                nullable: true
+                type: string
+              reportJSON:
+                nullable: true
+                type: string
+            type: object
+        type: object
\ No newline at end of file
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/Chart.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/Chart.yaml
new file mode 100644
index 000000000..353695492
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/Chart.yaml
@@ -0,0 +1,22 @@
+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/kube-version: '>=1.16.0-0'
+  catalog.cattle.io/namespace: cis-operator-system
+  catalog.cattle.io/os: linux
+  catalog.cattle.io/permits-os: linux,windows
+  catalog.cattle.io/provides-gvr: cis.cattle.io.clusterscans/v1
+  catalog.cattle.io/rancher-version: '>= 2.6.0-0'
+  catalog.cattle.io/release-name: rancher-cis-benchmark
+  catalog.cattle.io/type: cluster-tool
+  catalog.cattle.io/ui-component: rancher-cis-benchmark
+apiVersion: v1
+appVersion: v2.0.4-rc1
+description: The cis-operator enables running CIS benchmark security scans on a kubernetes
+  cluster
+icon: https://charts.rancher.io/assets/logos/cis-kube-bench.svg
+keywords:
+- security
+name: rancher-cis-benchmark
+version: 2.0.4-rc1
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/README.md b/charts/rancher-cis-benchmark/2.0.4-rc1/README.md
new file mode 100644
index 000000000..50beab58b
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/README.md
@@ -0,0 +1,9 @@
+# Rancher CIS Benchmark Chart
+
+The cis-operator enables running CIS benchmark security scans on a kubernetes cluster and generate compliance reports that can be downloaded.
+
+# Installation
+
+```
+helm install rancher-cis-benchmark ./ --create-namespace -n cis-operator-system
+```
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/app-readme.md b/charts/rancher-cis-benchmark/2.0.4-rc1/app-readme.md
new file mode 100644
index 000000000..5e495d605
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/app-readme.md
@@ -0,0 +1,15 @@
+# Rancher CIS Benchmarks
+
+This chart enables security scanning of the cluster using [CIS (Center for Internet Security) benchmarks](https://www.cisecurity.org/benchmark/kubernetes/).
+
+For more information on how to use the feature, refer to our [docs](https://rancher.com/docs/rancher/v2.x/en/cis-scans/v2.5/).
+
+This chart installs the following components:
+
+- [cis-operator](https://github.com/rancher/cis-operator) - The cis-operator handles launching the [kube-bench](https://github.com/aquasecurity/kube-bench) tool that runs a suite of CIS tests on the nodes of your Kubernetes cluster. After scans finish, the cis-operator generates a compliance report that can be downloaded.
+- Scans - A scan is a CRD (`ClusterScan`) that defines when to trigger CIS scans on the cluster based on the defined profile. A report is created after the scan is completed.
+- Profiles - A profile is a CRD (`ClusterScanProfile`) that defines the configuration for the CIS scan, which is the benchmark versions to use and any specific tests to skip in that benchmark. This chart installs a few default `ClusterScanProfile` custom resources with no skipped tests, which can immediately be used to launch CIS scans.
+- Benchmark Versions - A benchmark version is a CRD (`ClusterScanBenchmark`) that defines the CIS benchmark version to run using kube-bench as well as the valid configuration parameters for that benchmark. This chart installs a few default `ClusterScanBenchmark` custom resources.
+- Alerting Resources - Rancher's CIS Benchmark application lets you run a cluster scan on a schedule, and send alerts when scans finish.
+    - If you want to enable alerts to be delivered when a cluster scan completes, you need to ensure that [Rancher's Monitoring and Alerting](https://rancher.com/docs/rancher/v2.x/en/monitoring-alerting/v2.5/) application is pre-installed and the [Receivers and Routes](https://rancher.com/docs/rancher/v2.x/en/monitoring-alerting/v2.5/configuration/#alertmanager-config) are configured to send out alerts.
+    - Additionally, you need to set `alerts: true` in the Values YAML while installing or upgrading this chart.
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/_helpers.tpl b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/_helpers.tpl
new file mode 100644
index 000000000..b7bb00042
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/_helpers.tpl
@@ -0,0 +1,27 @@
+{{/* Ensure namespace is set the same everywhere */}}
+{{- define "cis.namespace" -}}
+  {{- .Release.Namespace | default "cis-operator-system" -}}
+{{- end -}}
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Windows cluster will add default taint for linux nodes,
+add below linux tolerations to workloads could be scheduled to those linux nodes
+*/}}
+{{- define "linux-node-tolerations" -}}
+- key: "cattle.io/os"
+  value: "linux"
+  effect: "NoSchedule"
+  operator: "Equal"
+{{- end -}}
+
+{{- define "linux-node-selector" -}}
+kubernetes.io/os: linux
+{{- end -}}
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/alertingrule.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/alertingrule.yaml
new file mode 100644
index 000000000..1787c88a0
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/alertingrule.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.alerts.enabled -}}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: rancher-cis-pod-monitor
+  namespace: {{ template "cis.namespace" . }}
+spec:
+  selector:
+    matchLabels:
+      cis.cattle.io/operator: cis-operator
+  podMetricsEndpoints:
+  - port: cismetrics
+{{- end }}
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-aks-1.0.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-aks-1.0.yaml
new file mode 100644
index 000000000..1ac866253
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-aks-1.0.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: aks-1.0
+spec:
+  clusterProvider: aks
+  minKubernetesVersion: "1.15.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-cis-1.5.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-cis-1.5.yaml
new file mode 100644
index 000000000..39e8b834a
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-cis-1.5.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: cis-1.5
+spec:
+  clusterProvider: ""
+  minKubernetesVersion: "1.15.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-cis-1.6.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-cis-1.6.yaml
new file mode 100644
index 000000000..93ba064f4
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-cis-1.6.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: cis-1.6
+spec:
+  clusterProvider: ""
+  minKubernetesVersion: "1.16.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-eks-1.0.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-eks-1.0.yaml
new file mode 100644
index 000000000..bd2e32cd3
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-eks-1.0.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: eks-1.0
+spec:
+  clusterProvider: eks
+  minKubernetesVersion: "1.15.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-gke-1.0.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-gke-1.0.yaml
new file mode 100644
index 000000000..72122e8c5
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-gke-1.0.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: gke-1.0
+spec:
+  clusterProvider: gke
+  minKubernetesVersion: "1.15.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-k3s-cis-1.6-hardened.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-k3s-cis-1.6-hardened.yaml
new file mode 100644
index 000000000..3ca9b6009
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-k3s-cis-1.6-hardened.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.6-hardened
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.20.5"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-k3s-cis-1.6-permissive.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-k3s-cis-1.6-permissive.yaml
new file mode 100644
index 000000000..6d4253c6e
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-k3s-cis-1.6-permissive.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: k3s-cis-1.6-permissive
+spec:
+  clusterProvider: k3s
+  minKubernetesVersion: "1.20.5"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.5-hardened.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.5-hardened.yaml
new file mode 100644
index 000000000..b5627f966
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.5-hardened.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.5-hardened
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.15.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.5-permissive.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.5-permissive.yaml
new file mode 100644
index 000000000..95f80c0f0
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.5-permissive.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.5-permissive
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.15.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.6-hardened.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.6-hardened.yaml
new file mode 100644
index 000000000..d75de8154
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.6-hardened.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.6-hardened
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.16.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.6-permissive.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.6-permissive.yaml
new file mode 100644
index 000000000..52428f4a7
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke-cis-1.6-permissive.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke-cis-1.6-permissive
+spec:
+  clusterProvider: rke
+  minKubernetesVersion: "1.16.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.5-hardened.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.5-hardened.yaml
new file mode 100644
index 000000000..3d83e9bd8
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.5-hardened.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.5-hardened
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.18.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.5-permissive.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.5-permissive.yaml
new file mode 100644
index 000000000..f66aa8f6e
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.5-permissive.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.5-permissive
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.18.0"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.6-hardened.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.6-hardened.yaml
new file mode 100644
index 000000000..3593bf371
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.6-hardened.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.6-hardened
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.20.5"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.6-permissive.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.6-permissive.yaml
new file mode 100644
index 000000000..522f846ae
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/benchmark-rke2-cis-1.6-permissive.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanBenchmark
+metadata:
+  name: rke2-cis-1.6-permissive
+spec:
+  clusterProvider: rke2
+  minKubernetesVersion: "1.20.5"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/cis-roles.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/cis-roles.yaml
new file mode 100644
index 000000000..23c93dc65
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/cis-roles.yaml
@@ -0,0 +1,49 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cis-admin
+rules:
+  - apiGroups:
+      - cis.cattle.io
+    resources:
+      - clusterscanbenchmarks
+      - clusterscanprofiles
+      - clusterscans
+      - clusterscanreports
+    verbs: ["create", "update", "delete", "patch","get", "watch", "list"]
+  - apiGroups:
+      - catalog.cattle.io
+    resources: ["apps"]
+    resourceNames: ["rancher-cis-benchmark"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cis-view
+rules:
+  - apiGroups:
+      - cis.cattle.io
+    resources:
+      - clusterscanbenchmarks
+      - clusterscanprofiles
+      - clusterscans
+      - clusterscanreports
+    verbs: ["get", "watch", "list"]
+  - apiGroups:
+      - catalog.cattle.io
+    resources: ["apps"]
+    resourceNames: ["rancher-cis-benchmark"]
+    verbs: ["get", "watch", "list"]
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs: ["get", "watch", "list"]
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/configmap.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/configmap.yaml
new file mode 100644
index 000000000..3de10e55e
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/configmap.yaml
@@ -0,0 +1,18 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: default-clusterscanprofiles
+  namespace: {{ template "cis.namespace" . }}
+data:
+  # Default ClusterScanProfiles per cluster provider type
+  rke: |-
+    <1.16.0: rke-profile-permissive-1.5
+    >=1.16.0: rke-profile-permissive-1.6
+  rke2: |-
+    <1.20.5: rke2-cis-1.5-profile-permissive
+    >=1.20.5: rke2-cis-1.6-profile-permissive
+  eks: "eks-profile"
+  gke: "gke-profile"
+  aks: "aks-profile"
+  k3s: "k3s-cis-1.6-profile-permissive"
+  default: "cis-1.6-profile"
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/deployment.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/deployment.yaml
new file mode 100644
index 000000000..e14c3ae83
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/deployment.yaml
@@ -0,0 +1,55 @@
+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: {{ include "linux-node-selector" . | nindent 8 }}
+{{- if .Values.nodeSelector }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+{{- if .Values.tolerations }}
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/network_policy_allow_all.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/network_policy_allow_all.yaml
new file mode 100644
index 000000000..6ed5d645e
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/patch_default_serviceaccount.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/patch_default_serviceaccount.yaml
new file mode 100644
index 000000000..e78a6bd08
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/patch_default_serviceaccount.yaml
@@ -0,0 +1,29 @@
+---
+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
+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
+{{- if .Values.nodeSelector }}
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
+{{- if .Values.tolerations }}
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
+      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/2.0.4-rc1/templates/rbac.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/rbac.yaml
new file mode 100644
index 000000000..4ff88ea5f
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/rbac.yaml
@@ -0,0 +1,43 @@
+apiVersion: rbac.authorization.k8s.io/v1
+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/v1
+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/2.0.4-rc1/templates/scanprofile-cis-1.5.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-cis-1.5.yml
new file mode 100644
index 000000000..d69ae9dd5
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofile-cis-1.6.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-cis-1.6.yaml
new file mode 100644
index 000000000..8a8d8bf88
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofile-k3s-cis-1.6-hardened.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-k3s-cis-1.6-hardened.yml
new file mode 100644
index 000000000..095e977ab
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-k3s-cis-1.6-hardened.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.6-profile-hardened
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.6-hardened
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-k3s-cis-1.6-permissive.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-k3s-cis-1.6-permissive.yml
new file mode 100644
index 000000000..3b22a80c8
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-k3s-cis-1.6-permissive.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: k3s-cis-1.6-profile-permissive
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: k3s-cis-1.6-permissive
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke-1.5-hardened.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke-1.5-hardened.yml
new file mode 100644
index 000000000..4eabe158a
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofile-rke-1.5-permissive.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke-1.5-permissive.yml
new file mode 100644
index 000000000..1f78751d1
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofile-rke-1.6-hardened.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke-1.6-hardened.yaml
new file mode 100644
index 000000000..d38febd80
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofile-rke-1.6-permissive.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke-1.6-permissive.yaml
new file mode 100644
index 000000000..d31b5b0d2
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofile-rke2-cis-1.5-hardened.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke2-cis-1.5-hardened.yml
new file mode 100644
index 000000000..83eb3131e
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofile-rke2-cis-1.5-permissive.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke2-cis-1.5-permissive.yml
new file mode 100644
index 000000000..40dc44bdf
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofile-rke2-cis-1.6-hardened.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke2-cis-1.6-hardened.yml
new file mode 100644
index 000000000..c7ac7f949
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofile-rke2-cis-1.6-permissive.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofile-rke2-cis-1.6-permissive.yml
new file mode 100644
index 000000000..96ca1345a
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofileaks.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofileaks.yml
new file mode 100644
index 000000000..ea7b25b40
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofileaks.yml
@@ -0,0 +1,9 @@
+---
+apiVersion: cis.cattle.io/v1
+kind: ClusterScanProfile
+metadata:
+  name: aks-profile
+  annotations:
+    clusterscanprofile.cis.cattle.io/builtin: "true"
+spec:
+  benchmarkVersion: aks-1.0
\ No newline at end of file
diff --git a/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofileeks.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofileeks.yml
new file mode 100644
index 000000000..49c7e0246
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/scanprofilegke.yml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/scanprofilegke.yml
new file mode 100644
index 000000000..2ddd0686f
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/serviceaccount.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/serviceaccount.yaml
new file mode 100644
index 000000000..ec48ec622
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/templates/validate-install-crd.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/templates/validate-install-crd.yaml
new file mode 100644
index 000000000..562295791
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/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/2.0.4-rc1/values.yaml b/charts/rancher-cis-benchmark/2.0.4-rc1/values.yaml
new file mode 100644
index 000000000..43f4a2063
--- /dev/null
+++ b/charts/rancher-cis-benchmark/2.0.4-rc1/values.yaml
@@ -0,0 +1,49 @@
+# 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.8-rc2
+  securityScan:
+    repository: rancher/security-scan
+    tag: v0.2.7-rc1
+  sonobuoy:
+    repository: rancher/mirrored-sonobuoy-sonobuoy
+    tag: v0.53.2
+
+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
+
+## Node labels for pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+
+## List of node taints to tolerate (requires Kubernetes >= 1.6)
+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 199ff8abb..75cd9aa65 100755
--- a/index.yaml
+++ b/index.yaml
@@ -2359,6 +2359,32 @@ entries:
     - assets/rancher-backup-crd/rancher-backup-crd-1.0.200.tgz
     version: 1.0.200
   rancher-cis-benchmark:
+  - 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/kube-version: '>=1.16.0-0'
+      catalog.cattle.io/namespace: cis-operator-system
+      catalog.cattle.io/os: linux
+      catalog.cattle.io/permits-os: linux,windows
+      catalog.cattle.io/provides-gvr: cis.cattle.io.clusterscans/v1
+      catalog.cattle.io/rancher-version: '>= 2.6.0-0'
+      catalog.cattle.io/release-name: rancher-cis-benchmark
+      catalog.cattle.io/type: cluster-tool
+      catalog.cattle.io/ui-component: rancher-cis-benchmark
+    apiVersion: v1
+    appVersion: v2.0.4-rc1
+    created: "2022-05-03T14:07:18.24078494+05:30"
+    description: The cis-operator enables running CIS benchmark security scans on
+      a kubernetes cluster
+    digest: 22f0062f9a587d5edce082fda69766236c52a30aa17799e79b32e34ae0ee41ad
+    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-2.0.4-rc1.tgz
+    version: 2.0.4-rc1
   - annotations:
       catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match
       catalog.cattle.io/certified: rancher
@@ -2596,6 +2622,20 @@ entries:
     - assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.100.tgz
     version: 1.0.100
   rancher-cis-benchmark-crd:
+  - 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: "2022-05-03T14:07:18.251188179+05:30"
+    description: Installs the CRDs for rancher-cis-benchmark.
+    digest: 39208bb9bd781198e6fda3e4345725f3984acb18f640fe6ea4985b55dbbfc3ce
+    name: rancher-cis-benchmark-crd
+    type: application
+    urls:
+    - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.0.4-rc1.tgz
+    version: 2.0.4-rc1
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"