From 45c9ee7d0fba8815327709f0be01496489ea9ac6 Mon Sep 17 00:00:00 2001
From: Geet Samra <amangeet.samra@suse.com>
Date: Tue, 25 Apr 2023 14:08:30 -0700
Subject: [PATCH] forward port rancher-cis-benchmark-crd version 2.1.2

---
 .../rancher-cis-benchmark-crd-2.1.2.tgz       | Bin 0 -> 1462 bytes
 .../2.1.2/Chart.yaml                          |  10 ++
 .../rancher-cis-benchmark-crd/2.1.2/README.md |   2 +
 .../2.1.2/templates/clusterscan.yaml          | 148 ++++++++++++++++++
 .../2.1.2/templates/clusterscanbenchmark.yaml |  54 +++++++
 .../2.1.2/templates/clusterscanprofile.yaml   |  36 +++++
 .../2.1.2/templates/clusterscanreport.yaml    |  39 +++++
 index.yaml                                    |  14 ++
 release.yaml                                  |   2 +
 9 files changed, 305 insertions(+)
 create mode 100644 assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.1.2.tgz
 create mode 100644 charts/rancher-cis-benchmark-crd/2.1.2/Chart.yaml
 create mode 100644 charts/rancher-cis-benchmark-crd/2.1.2/README.md
 create mode 100644 charts/rancher-cis-benchmark-crd/2.1.2/templates/clusterscan.yaml
 create mode 100644 charts/rancher-cis-benchmark-crd/2.1.2/templates/clusterscanbenchmark.yaml
 create mode 100644 charts/rancher-cis-benchmark-crd/2.1.2/templates/clusterscanprofile.yaml
 create mode 100644 charts/rancher-cis-benchmark-crd/2.1.2/templates/clusterscanreport.yaml

diff --git a/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.1.2.tgz b/assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.1.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..45ded0bf7a848e97178af27f0b268b7976d56c54
GIT binary patch
literal 1462
zcmV;n1xflJiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PI>(bE7s8&a;1o=K5?7h?8{umh)XZ*Y<K5C%rze#m3eJBt}}&
z^K|;(I|32|24igOT<5$m9!ug|3BLVSTF@Z*0`-s!Gn}F1iwN}Nkn7;>WC5C-B}C!b
zp60r)dpR1Vzpm?6f87h;J@ZB*-}U`-*Y(a^@6sJzo-ub{$J<z92=tk|x3B8r{wD@f
zDgqKpn(=@!4g{f^I~<5YbcA}#QImKO7>rrYmD*to5d<j5><#Gz-_#C~5TS{I<Cs~t
zsTeho(nGT}gi-A!8bbtwLwo6q|8=eoAQoRx8=>TwJ$Zuw4c8*3^#4a`2*S`XS|FQD
z-y8OzbUl_cXmdo%7{?6aI21g+YlEj}zrN!+{@}HrXIE>Ef5IpZfzZ6=VPXii;UIU?
zgU#{pxxVL><KOqr{i{>_AH#}~1F^twgwp;q&g0L<hTxMocoZ@ivq@q|MN>2?(H!67
zgODPPfCvc!Ah7z8#ZQ4S#^J)OB6?tA<aXd(t0Yc^pwO9Jp9&FUxz`Npj)P2F<1o<>
zmR$@OGhErg%tsFx%fm9o8s^h_@=^$c`pL?fRjRCkl!iGLS|AA0wLy5Rg(TDy6(*6)
zXEtPCjgq%Oi!pNy0VT!>!O%33cAmFdJ%|u*Aj-g=?@D1Q`H;Lj6BR>R$a$j!lSC2d
zr9+A!EaBc4S~@|+U`z?=cGb`c=mA7|O24ccIsutS5to4ORt=qi{st{eK!2?oIsr*V
z*O}VS!t&$1QN-4|w!+T2axWq@1W|d#f7Exj0LRE3!xtDNAqJLV6D1$S+~HcuyS%+j
z#`TUh7bcnMJlu2U+gPzn7_)!=&4%y=M)2IJVwBgnAHSU6m6{ogwaxY<RygU!xfZOf
zeq83L6j;@6#$*zP_CXY)xM*vOD?+c`x6bg*6Sr1;3U&Rh@GUE_rjbxu&6=o0QoWZ9
z!V20v70IgEn|vLjrs+Nt-Fz>sf%WlOPE-_!NDZD=6P_s*BFN2PR&o-(7gjbx&AuY1
z1_IS~8m=^2ff2HXIVh88y>-Y6>RW6sXz9v!C3nN5^B~?b^ltDQ+0eMIVb$(YclXRS
zA?KEEeMdD{GRxsLEEI%MEjin$YnA(6gET3!)#xU^Z4oD}A)WdAGY)|8@V+86#_oa+
z>O><LB@gSPj@^CxNCzCy!$v9EDkwl}SXTN1Vd4;$J!d!6TIo#*r&)71a&G^eXqj*@
zaC*^!TG?l<%ir*f>rWGX%42m8+9$S}Wk;-EQKC+(B<tv#wj%l7yJwo(#JbzIsB{L{
z4Z<e-9rt99qUPajb7gu`-0f0(eA?y8MoQOqlp0^V5b}ds$NJx@RNA2s*i!%ZuSS=Z
z`ro<lyQli!G3?OwzZb&vSO|RgjG1=VR0LN}U$-<EBX{y?-D>qDf)~jwRRk-2Ta<bt
zA%9P1s3j7b{P~rTKQ#~71|Gh(z&8)r0-mQ#dU=Xj$>kHoYZcQi2JY!DeIK>8&*JFs
zx>{BtU9acr4fp3*ezLcSJvyr+e6RR5;n*MkKAWqK`9IE1Bi&vDw&Z{B!auL%fB(um
zz5hRo9XkK#gy}K+7vG)L<o;)e{b&B~N#I{X^#EdJPn`E?s7v9rwVblCn6hI*t6lfl
z4jZ=Wtu5^i-qm-OR`=Q=-N`!Yzs6W~{wl0Z|1U2ts``I%b^89}D0XQ5&j{0_{7+NB
zCiTzVz5cQ9K=1hX7AN)tC9*@-xHF>tcK7+_i2L{h#DBB?Pd{A0|MbC$g1vpTegEr?
z{L1&g7bEvn|2vBPwBcjdYc|dL7+-)UMhhS&);_0A3<hkrZ2F}3wO4qulb!5jC#$pn
Q0ssL2|9b!Cv;Z^!0Fz$kHvj+t

literal 0
HcmV?d00001

diff --git a/charts/rancher-cis-benchmark-crd/2.1.2/Chart.yaml b/charts/rancher-cis-benchmark-crd/2.1.2/Chart.yaml
new file mode 100644
index 000000000..9a2c96d2c
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.1.2/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.1.2
diff --git a/charts/rancher-cis-benchmark-crd/2.1.2/README.md b/charts/rancher-cis-benchmark-crd/2.1.2/README.md
new file mode 100644
index 000000000..f6d9ef621
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.1.2/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.1.2/templates/clusterscan.yaml b/charts/rancher-cis-benchmark-crd/2.1.2/templates/clusterscan.yaml
new file mode 100644
index 000000000..3cbb0ffcd
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.1.2/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.1.2/templates/clusterscanbenchmark.yaml b/charts/rancher-cis-benchmark-crd/2.1.2/templates/clusterscanbenchmark.yaml
new file mode 100644
index 000000000..fd291f8c3
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.1.2/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.1.2/templates/clusterscanprofile.yaml b/charts/rancher-cis-benchmark-crd/2.1.2/templates/clusterscanprofile.yaml
new file mode 100644
index 000000000..1e75501b7
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.1.2/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.1.2/templates/clusterscanreport.yaml b/charts/rancher-cis-benchmark-crd/2.1.2/templates/clusterscanreport.yaml
new file mode 100644
index 000000000..6e8c0b7de
--- /dev/null
+++ b/charts/rancher-cis-benchmark-crd/2.1.2/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/index.yaml b/index.yaml
index 7be456f24..567927ec8 100755
--- a/index.yaml
+++ b/index.yaml
@@ -5908,6 +5908,20 @@ entries:
     urls:
     - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-3.0.0.tgz
     version: 3.0.0
+  - 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: "2023-04-25T14:08:20.85722-07:00"
+    description: Installs the CRDs for rancher-cis-benchmark.
+    digest: 24db508820b01902b7aa321d37c7cb5aa20e899d7cc6548d365dfa73829ffde0
+    name: rancher-cis-benchmark-crd
+    type: application
+    urls:
+    - assets/rancher-cis-benchmark-crd/rancher-cis-benchmark-crd-2.1.2.tgz
+    version: 2.1.2
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/hidden: "true"
diff --git a/release.yaml b/release.yaml
index 044dd08e0..29f152261 100644
--- a/release.yaml
+++ b/release.yaml
@@ -42,3 +42,5 @@ rancher-vsphere-cpi:
   - 100.6.0+up1.4.2
 rancher-cis-benchmark:
   - 2.1.2
+rancher-cis-benchmark-crd:
+  - 2.1.2