From b90600cc7809db49ac52ddb7a194a53955dced43 Mon Sep 17 00:00:00 2001 From: Jacob Payne Date: Thu, 1 Jul 2021 15:14:48 -0700 Subject: [PATCH] Fix/issue-98 (clusterscan not found) (#1323) * removed cis version 1.0.6 * fixed missing status on cis clusterscan resource * make charts --- .../rancher-cis-benchmark-1.0.600.tgz | Bin 5076 -> 0 bytes .../rancher-cis-benchmark-crd-1.0.600.tgz | Bin 1459 -> 0 bytes .../rancher-cis-benchmark-crd-2.0.0.tgz | Bin 1459 -> 1463 bytes .../1.0.600/Chart.yaml | 10 -- .../1.0.600/README.md | 2 - .../1.0.600/templates/clusterscan.yaml | 146 ------------------ .../templates/clusterscanbenchmark.yaml | 54 ------- .../1.0.600/templates/clusterscanprofile.yaml | 36 ----- .../1.0.600/templates/clusterscanreport.yaml | 39 ----- .../2.0.0/templates/clusterscan.yaml | 2 + .../rancher-cis-benchmark/1.0.600/Chart.yaml | 18 --- .../rancher-cis-benchmark/1.0.600/README.md | 9 -- .../1.0.600/app-readme.md | 15 -- .../1.0.600/templates/_helpers.tpl | 23 --- .../1.0.600/templates/alertingrule.yaml | 14 -- .../1.0.600/templates/benchmark-cis-1.5.yaml | 8 - .../1.0.600/templates/benchmark-cis-1.6.yaml | 8 - .../1.0.600/templates/benchmark-eks-1.0.yaml | 8 - .../1.0.600/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 - .../1.0.600/templates/cis-roles.yaml | 49 ------ .../1.0.600/templates/configmap.yaml | 17 -- .../1.0.600/templates/deployment.yaml | 57 ------- .../templates/network_policy_allow_all.yaml | 15 -- .../patch_default_serviceaccount.yaml | 20 --- .../1.0.600/templates/rbac.yaml | 43 ------ .../1.0.600/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 -- .../1.0.600/templates/scanprofileeks.yml | 9 -- .../1.0.600/templates/scanprofilegke.yml | 9 -- .../1.0.600/templates/serviceaccount.yaml | 14 -- .../templates/validate-install-crd.yaml | 17 -- .../rancher-cis-benchmark/1.0.600/values.yaml | 45 ------ index.yaml | 36 ----- .../charts/crds/clusterscan.yaml | 2 + 54 files changed, 4 insertions(+), 917 deletions(-) delete mode 100644 assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.600.tgz delete mode 100644 assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-1.0.600.tgz delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/Chart.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/README.md delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscan.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanbenchmark.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanprofile.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanreport.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/Chart.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/README.md delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/app-readme.md delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/_helpers.tpl delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/alertingrule.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-cis-1.5.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-cis-1.6.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-eks-1.0.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-gke-1.0.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-k3s-cis-1.6-hardened.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-k3s-cis-1.6-permissive.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.5-hardened.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.5-permissive.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.6-hardened.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.6-permissive.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.5-hardened.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.5-permissive.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.6-hardened.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.6-permissive.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/cis-roles.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/configmap.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/deployment.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/network_policy_allow_all.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/patch_default_serviceaccount.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/rbac.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-cis-1.5.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-cis-1.6.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-k3s-cis-1.6-hardened.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-k3s-cis-1.6-permissive.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.5-hardened.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.5-permissive.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.6-hardened.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.6-permissive.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.5-hardened.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.5-permissive.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.6-hardened.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.6-permissive.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofileeks.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofilegke.yml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/serviceaccount.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/validate-install-crd.yaml delete mode 100644 charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/values.yaml diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.600.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-1.0.600.tgz deleted file mode 100644 index 3839b557d410a23d94e3d2fe79c1761ae918458d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5076 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 diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-1.0.600.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-1.0.600.tgz deleted file mode 100644 index c450933acc89f08e7e9475507c64cfb4ecee2b21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1459 zcmV;k1x)%MiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI>(bK*7-&NIJ4bA85V2#^kMIqurIwwKG0^!mKW8_>m;JkmN1 z)9HWj$TnbujWO7yow6?slKibKfBUVpwg$-;sJmR4?hGYg1fZY0Tzl^)3(({&A@HwG zG}m?A(O?k&x~{wZ>kj+dd6y^(vgaAzl9LLPE zO@*j|l?AlA${&%_Bflz!yZG@6z_R{NkXt)+3#s5D`L*V;{(E{0I z`q8i_rHiqgPL(5ChB#&rhQ8qOs&!sgetVAVj9j<#)=#vamB&9}5c)u9-g7@PgxYYB zN9n=-`0u&B!6+a9{oeJ+y~O`HEE_ox3VbD$_MdT{e>64(UwWNqA-yr1M21u_MWZ6k z@gqJ7DdGqSkiY{1s~<`HWC&v%F3cvPJ0?VK2hO#M!dM70oyqmF5HXf|O`sk)$hbB1 zBMpAuMTarNl?}{vbceAtEMu&0I<1#p3}H~eSUIywl{ApjFvm;_cwT&O;NNQ@3H3zz zQ6STqb=h~LxR4=e<@>!pA!Z60p^(WNsxLl6EJeVn_=)FLhv| zAOO8|ND=rs+{a8yEvOKT$syfu8fpPOfyhtkr%gjGAoDE39MHq2p%&1epk)r|k4-}@ zAgSm!QTv&nf1G!U*iP3$*eO>YMSzAN$lvjA#hn$vA#%s?1$vQ>o@LlX$tN*)xK{EZ zZO@Z&w`0eJ1q@)EcB>HO?fvI(*AKa7#zJjVIf+%^CbkOnjTMhe9Oa^ByPGi?`MzD{ zOo(P}XXaVxokgh)Up{eb*(EOOuY|9-18W)yr4^)!iX;_#Ng%9R&0_`JHoM5TK5Ckt zGSU5OVGXR0uX3V-&_^oqw3+ZsDIY=Z2eWz->65UM5o-1wIh7Eou+wm*(W-}#1o_ zde|#P2L%Oa4a==QPngh$Wy9GGwN`px!YS9>y_`EeCt4=722N`oD3pCxdHZ{waq&^1 zNqOAfU^a=ZX36>KXOyVp638z4zO6{Qv2K{AHnASJEy`{1kAtwu{>VMqvnY5thg=yS z1CP7Zo{f&VvXs(=9l6H0u5w(g%xc#EHl@-Ug}{pXfB$Bu{&(FUTh_ZjJpdef*YrATN(_JJL$CUwR#cWT2*ru!L7anNgK@y#}nv|Gi=VdMp3;Zw8n5 ze`m3_^M6X12D5+m-C05IUpZ_(^Z%O!ejTbUh?PB*KBA#Iwbjas%iem+ku|Ss-D5{= z*tVB8w>$Vy+?l((w+`uAR#X2qhN|{gVO9D+8VTN*Z=9K+mBy9Ie~YwkE-u~dxP!o ze}{wqrT%vo`(e+=uD5KO^fA5wO^g;mOzeD48yWQ2Y+3e6?OWgB#V&TSi(Rb9{s{m8 N|NnAs56b{F006Xz+9&`3 diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-2.0.0.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-2.0.0.tgz index 9e5eb3285221622926e4581544beed5e08cdcbba..7ec434c945e346251a67fb10fdebaad464170ec0 100644 GIT binary patch delta 1407 zcmV-_1%Udq3%3i9Nq;zgba=avw3D{E+;G?Qd6D-(Ia~5b>uZ=!|M!k;-(edYV=$0T z*cS##{#LTT{Z?9AgXBxpT`o*_j*>3}&`({iy|>dPXmVB%_*Vy->$>h}Fo=I$*De0K z!@hgf8@Qu!Z!{iXyH{>+E=)1ZYCwIANA;Dnt#Wbl0p5VNiOB zMjydo*IxSSf0L^n2*nrFMkqO9&%KU^hHDX0{Qsjg1io(=Es;%U?+trYx*W^t)H$M6 zh!X~3=nEd-wSUg@i{HNEI&SCO&$Fpj$3I~Z`ao#jaz8SJ+HjD2>B08+@45Y6FCYK? z-t};FiT_hrHgX^o_>EB7f5v(G+1L<#?scAo^d@W?8B)OvjfynK_xLEJh$A3C0uKnR zekAdeA&hajFzbl!m=L)gxX>yJV9n4EF@!<=Y~{=$0y#$vdFs zggJ(QBIEdAXckF3&pWLig^#xoBw#OhC9{-tNZOrCVz)?w{BxM=^e}k4epug4)jew-0n?&vBe*SUZ zDqc@O~_f*`-*Kgv66fJ5Yt;Y;))A3e*ksgjRk;c%_wecGNU<7UT(3lq(C z8ty6cZLHWOOxQpFCPVlV19<6FAWN#+K83RWTKJk3Skp)-t!7PCB&pm>0$~Mh5sPHe z>`lJ$QPb>@iEh6a*1-DsET<|6eWVIc>j}@5@)6{AFe^EcJ_surq2^zaQw4!aI}KMF zt$)A>S;8EYQLx$CWf}F&HfOYSZTphDV$x|4?-+Ww_>F96+?23t|ERlv;hK;OOSiV8 znk$*)@DdgZ!l0C#b=0-W{h&db7};uc72kGK}U6>5sZ?@ z^-;#|wtd6{j_6^l6zvogpf#)teV#C(4}Ytcvm0uy^tOakt+`t{cX&>;OgI`iz3M=z z?6cbCZ+XV$r-?S@vA73q6I;!bBi64dQO8x1P4sPBk#z6fGEHq_-EUizI|J+oVUzuy zd$K1{@^E&!GCnEpcd0!-?Q>-%rAs?B=WYcXZdf>yomu{}0y z#ao-(9lR^=%&qR+A>GIt>c7TNHU28BPX9;4VNw4_{mb_sC$VGee?piR<#>M<16HYj z>hAosNK_S^mE+Y|2Nj}ZUW`ak<{^ZwHZC-4sTQTP3CZ_qD% z|2rJ?FZI8Z*iTzNcD-Su3>XkxSkVq)WS+Q^{C=BuhtYR|pGi(Twu7rR)Q{TBcL N|NlV*fq?)t007%q)J*^Y delta 1403 zcmV->1%&#y3$qK5Nq_Sz9o{Y^?WAokH{3OSUgSMc&XzpV`WmLw|GgvIfDJarV7PY5 zzA#Agx3c{0x6;}gBwwKJa$&kNlzb6_e(rMZznv^Vle2^{xH-{W*L6pOLGtUm?)I-c z?727Iz#a9ycka;Z-?-k$9rbRQd#d9@EH(uC#y#2B_RalA41c6l1SFI+;|^mS2m&>C zI1mNs2=$huCh;WDAG3@rrNb7&_fd}78`3epDIFpqL=yqWF|%w_5o#c%yJl$!!_rGM z1_%bb_R_WgU9NT@5?@gpq2!pocpV=N*CL|i|0ih(g1|6ZAe&4-81|%eIhNC@b41Gs z#|)w<5IkA6&VS3wZ_jZZxAWT1v#C|bKVcXJKxp3bAU1^BaF9po!T$L7TyHQc#(&T2 z53lim5z9voL;}APO8d_^&p#R)f-hd@SxA4(Cb1zEPSL1XbNql$LW(2;LL~5k!0JaD zKRLn}hYPcb=#Ghy+ktbf;wTYK7|#R;khkQX1x%YXRR+?hS%_EhM3ys2~nyHnT4KW|X`KT8x=v z2q-pA0EVWqwDY{z>PZB62Vn}fT9w?bWJ9v(l(WoSOsost3cma`MA_kA%AMNyBU*l5ZG1Dg=pS(W}b)MS(L`` z)f2atU*fXx{6vC?2JW;@Hvx|Hipr+|56WzZS*1-DsA}1=0 z0;CF0n+ea93J~OeFsmoAJ_#!wp=RHZQw4!aI}KMFt$GMq!W@)wxZB!gIcd!|=Y(=& z$A6N$V$!L|92$Ce_?>KM+?KHF_^5kWaZSj%rCZxk&6P|ObO{RuVOUDeI_g?ke$*gM zf@}r2if;$RNo`1{{(g^qAUwaX5RI{0oU=O72u8{C`Y2;}+dh&3XY{aFiVg}2&>EIo zeZDYJ0LzxM8)~iezJyb)xqCTxdQP-VIDZ>Bt#zPO_F3)i?|H`MM};=!aeIT=CbpWT z=ck`hqE1R6yXgD2BH6~eWt!T=dfc|Cu)#kL!Y2D8_hiqa3=S% z2yUFdZfP(=?qt)t*Xl+1YgH{&1h@JQDD{Lw{u<9vOC&Ve^D7{Kt{!j*JbbT#uO4s! zJWrUkeu`;T<}*Y)71IL-p6D)lA9b+L{OH|kSv=EOaIAL&*=dFS_4j29YFngh_2|84 zeJie-&1z|D)k>TmMI1|Em9&uygBwN|+Yqf0_VRsdRtl?)8s- zXL`qfvN*B-Q6f8M89XK0FArbtF1U|BL;P3k|McVShtD6K&_CHn-S@xVpttq??{MH< z>wg!qANG9gddsG1AL9$q#ApG;#Lnlmu|c2BmQ|nBzV;nn?P^!M+SSVJp8x;=|NrD# JSFQjw002uL#d`n% diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/Chart.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/Chart.yaml deleted file mode 100644 index 478b07ed8..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/Chart.yaml +++ /dev/null @@ -1,10 +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 -description: Installs the CRDs for rancher-cis-benchmark. -name: rancher-cis-benchmark-crd -type: application -version: 1.0.600 diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/README.md b/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/README.md deleted file mode 100644 index f6d9ef621..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# rancher-cis-benchmark-crd -A Rancher chart that installs the CRDs used by rancher-cis-benchmark. diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscan.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscan.yaml deleted file mode 100644 index e3dfa3cc9..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscan.yaml +++ /dev/null @@ -1,146 +0,0 @@ -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 - 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/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanbenchmark.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanbenchmark.yaml deleted file mode 100644 index fd291f8c3..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanbenchmark.yaml +++ /dev/null @@ -1,54 +0,0 @@ -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/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanprofile.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanprofile.yaml deleted file mode 100644 index 1e75501b7..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanprofile.yaml +++ /dev/null @@ -1,36 +0,0 @@ -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/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanreport.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanreport.yaml deleted file mode 100644 index 6e8c0b7de..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/1.0.600/templates/clusterscanreport.yaml +++ /dev/null @@ -1,39 +0,0 @@ -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/rancher-cis-benchmark-crd/2.0.0/templates/clusterscan.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/2.0.0/templates/clusterscan.yaml index e3dfa3cc9..3cbb0ffcd 100644 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/2.0.0/templates/clusterscan.yaml +++ b/charts/rancher-cis-benchmark/rancher-cis-benchmark-crd/2.0.0/templates/clusterscan.yaml @@ -40,6 +40,8 @@ spec: - jsonPath: .spec.scheduledScanConfig.cronSchedule name: CronSchedule type: string + subresources: + status: {} schema: openAPIV3Schema: properties: diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/Chart.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/Chart.yaml deleted file mode 100644 index f269a8006..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -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.5 -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: 1.0.600 diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/README.md b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/README.md deleted file mode 100644 index 50beab58b..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# 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/rancher-cis-benchmark/1.0.600/app-readme.md b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/app-readme.md deleted file mode 100644 index 5e495d605..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/app-readme.md +++ /dev/null @@ -1,15 +0,0 @@ -# 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/rancher-cis-benchmark/1.0.600/templates/_helpers.tpl b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/_helpers.tpl deleted file mode 100644 index 67f4ce116..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/_helpers.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{{/* 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 -}} diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/alertingrule.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/alertingrule.yaml deleted file mode 100644 index 1787c88a0..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/alertingrule.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- 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/rancher-cis-benchmark/1.0.600/templates/benchmark-cis-1.5.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-cis-1.5.yaml deleted file mode 100644 index 39e8b834a..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-cis-1.5.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-cis-1.6.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-cis-1.6.yaml deleted file mode 100644 index 93ba064f4..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-cis-1.6.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-eks-1.0.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-eks-1.0.yaml deleted file mode 100644 index bd2e32cd3..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-eks-1.0.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-gke-1.0.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-gke-1.0.yaml deleted file mode 100644 index 72122e8c5..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-gke-1.0.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-k3s-cis-1.6-hardened.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-k3s-cis-1.6-hardened.yaml deleted file mode 100644 index 3ca9b6009..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-k3s-cis-1.6-hardened.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-k3s-cis-1.6-permissive.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-k3s-cis-1.6-permissive.yaml deleted file mode 100644 index 6d4253c6e..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-k3s-cis-1.6-permissive.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.5-hardened.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.5-hardened.yaml deleted file mode 100644 index b5627f966..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.5-hardened.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.5-permissive.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.5-permissive.yaml deleted file mode 100644 index 95f80c0f0..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.5-permissive.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.6-hardened.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.6-hardened.yaml deleted file mode 100644 index d75de8154..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.6-hardened.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.6-permissive.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.6-permissive.yaml deleted file mode 100644 index 52428f4a7..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke-cis-1.6-permissive.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.5-hardened.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.5-hardened.yaml deleted file mode 100644 index 3d83e9bd8..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.5-hardened.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.5-permissive.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.5-permissive.yaml deleted file mode 100644 index f66aa8f6e..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.5-permissive.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.6-hardened.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.6-hardened.yaml deleted file mode 100644 index 3593bf371..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.6-hardened.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.6-permissive.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.6-permissive.yaml deleted file mode 100644 index 522f846ae..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/benchmark-rke2-cis-1.6-permissive.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/cis-roles.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/cis-roles.yaml deleted file mode 100644 index 23c93dc65..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/cis-roles.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/configmap.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/configmap.yaml deleted file mode 100644 index 6cbc23db4..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/configmap.yaml +++ /dev/null @@ -1,17 +0,0 @@ -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" - k3s: "k3s-cis-1.6-profile-permissive" - default: "cis-1.6-profile" diff --git a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/deployment.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/deployment.yaml deleted file mode 100644 index 0d3c75e39..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/deployment.yaml +++ /dev/null @@ -1,57 +0,0 @@ -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.600/templates/network_policy_allow_all.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/network_policy_allow_all.yaml deleted file mode 100644 index 6ed5d645e..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/network_policy_allow_all.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -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.600/templates/patch_default_serviceaccount.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/patch_default_serviceaccount.yaml deleted file mode 100644 index 1efa3ed1c..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/patch_default_serviceaccount.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -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.600/templates/rbac.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/rbac.yaml deleted file mode 100644 index 4ff88ea5f..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/rbac.yaml +++ /dev/null @@ -1,43 +0,0 @@ -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/rancher-cis-benchmark/1.0.600/templates/scanprofile-cis-1.5.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-cis-1.5.yml deleted file mode 100644 index d69ae9dd5..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-cis-1.5.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofile-cis-1.6.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-cis-1.6.yaml deleted file mode 100644 index 8a8d8bf88..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-cis-1.6.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofile-k3s-cis-1.6-hardened.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-k3s-cis-1.6-hardened.yml deleted file mode 100644 index 095e977ab..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-k3s-cis-1.6-hardened.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/scanprofile-k3s-cis-1.6-permissive.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-k3s-cis-1.6-permissive.yml deleted file mode 100644 index 3b22a80c8..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-k3s-cis-1.6-permissive.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.5-hardened.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.5-hardened.yml deleted file mode 100644 index 4eabe158a..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.5-hardened.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofile-rke-1.5-permissive.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.5-permissive.yml deleted file mode 100644 index 1f78751d1..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.5-permissive.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofile-rke-1.6-hardened.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.6-hardened.yaml deleted file mode 100644 index d38febd80..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.6-hardened.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofile-rke-1.6-permissive.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.6-permissive.yaml deleted file mode 100644 index d31b5b0d2..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke-1.6-permissive.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofile-rke2-cis-1.5-hardened.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.5-hardened.yml deleted file mode 100644 index 83eb3131e..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.5-hardened.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofile-rke2-cis-1.5-permissive.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.5-permissive.yml deleted file mode 100644 index 40dc44bdf..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.5-permissive.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofile-rke2-cis-1.6-hardened.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.6-hardened.yml deleted file mode 100644 index c7ac7f949..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.6-hardened.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofile-rke2-cis-1.6-permissive.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.6-permissive.yml deleted file mode 100644 index 96ca1345a..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofile-rke2-cis-1.6-permissive.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofileeks.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofileeks.yml deleted file mode 100644 index 49c7e0246..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofileeks.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/scanprofilegke.yml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofilegke.yml deleted file mode 100644 index 2ddd0686f..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/scanprofilegke.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -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.600/templates/serviceaccount.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/serviceaccount.yaml deleted file mode 100644 index ec48ec622..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/serviceaccount.yaml +++ /dev/null @@ -1,14 +0,0 @@ -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.600/templates/validate-install-crd.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/validate-install-crd.yaml deleted file mode 100644 index 562295791..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/templates/validate-install-crd.yaml +++ /dev/null @@ -1,17 +0,0 @@ -#{{- 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.600/values.yaml b/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/values.yaml deleted file mode 100644 index e1086b1ac..000000000 --- a/charts/rancher-cis-benchmark/rancher-cis-benchmark/1.0.600/values.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# 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.5-rc1 - securityScan: - repository: rancher/security-scan - tag: v0.2.3 - 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 ec0c62e13..6c7fcf8f2 100755 --- a/index.yaml +++ b/index.yaml @@ -1038,28 +1038,6 @@ entries: urls: - assets/rancher-cis-benchmark/rancher-cis-benchmark-2.0.0.tgz version: 2.0.0 - - 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.5 - created: "2021-06-23T08:47:16.839587-07:00" - description: The cis-operator enables running CIS benchmark security scans on - a kubernetes cluster - digest: bc8c801eeac9fbbb60a9be9a72025f6df4f1835dc5cf80c18020a9462c1623af - 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.600.tgz - version: 1.0.600 - annotations: catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match catalog.cattle.io/certified: rancher @@ -1184,20 +1162,6 @@ entries: urls: - assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-2.0.0.tgz version: 2.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: "2021-06-23T08:47:16.84256-07:00" - description: Installs the CRDs for rancher-cis-benchmark. - digest: d9d6b9ee14110b3ed3953004c6be4437783402bfe065c0223123d74037db970b - name: rancher-cis-benchmark-crd - type: application - urls: - - assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-1.0.600.tgz - version: 1.0.600 - annotations: catalog.cattle.io/certified: rancher catalog.cattle.io/hidden: "true" diff --git a/packages/rancher-cis-benchmark/charts/crds/clusterscan.yaml b/packages/rancher-cis-benchmark/charts/crds/clusterscan.yaml index e3dfa3cc9..3cbb0ffcd 100755 --- a/packages/rancher-cis-benchmark/charts/crds/clusterscan.yaml +++ b/packages/rancher-cis-benchmark/charts/crds/clusterscan.yaml @@ -40,6 +40,8 @@ spec: - jsonPath: .spec.scheduledScanConfig.cronSchedule name: CronSchedule type: string + subresources: + status: {} schema: openAPIV3Schema: properties: