Skip to content

Commit 2fc0390

Browse files
vardhaman22vardhaman22
authored
Merge pull request #706 from vardhaman22/v1.3/eks-1.5.0
[release/v1.3] added eks 1.5.0 profile and bumped chart version
2 parents 73c1e52 + ec418b6 commit 2fc0390

File tree

10 files changed

+53
-36
lines changed

10 files changed

+53
-36
lines changed

‎chart/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ annotations:
1212
catalog.cattle.io/type: cluster-tool
1313
catalog.cattle.io/ui-component: rancher-cis-benchmark
1414
apiVersion: v1
15-
appVersion: v7.3.0
15+
appVersion: v7.4.0-rc.1
1616
description: The cis-operator enables running CIS benchmark security scans on a kubernetes
1717
cluster
1818
icon: https://charts.rancher.io/assets/logos/cis-kube-bench.svg
1919
keywords:
2020
- security
2121
name: rancher-cis-benchmark
22-
version: 7.3.0
22+
version: 7.4.0-rc.1

‎chart/app-readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ This chart installs the following components:
2828
| CIS | k3s | [k3s-cis-1.9](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/k3s-cis-1.9) | k3s-v1.27+ |
2929
| CIS | k3s | [k3s-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/k3s-cis-1.8-permissive) | k3s-v1.26 |
3030
| CIS | k3s | [k3s-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/k3s-cis-1.8-hardened) | k3s-v1.26 |
31+
| CIS | eks | [eks-1.5.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/eks-1.5.0) | eks-1.27.0+ |
3132
| CIS | eks | [eks-1.2.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/eks-1.2.0) | eks |
3233
| CIS | aks | [aks-1.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/aks-1.0) | aks |
3334
| CIS | gke | [gke-1.2.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/gke-1.2.0) | gke-1.20 |

‎chart/templates/benchmark-eks-1.2.0.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ metadata:
66
spec:
77
clusterProvider: eks
88
minKubernetesVersion: "1.15.0"
9+
maxKubernetesVersion: "1.26.x"

‎chart/templates/benchmark-eks-1.5.0.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
apiVersion: cis.cattle.io/v1
3+
kind: ClusterScanBenchmark
4+
metadata:
5+
name: eks-1.5.0
6+
spec:
7+
clusterProvider: eks
8+
minKubernetesVersion: "1.27.0"

‎chart/templates/configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ data:
1111
rke2: |-
1212
<1.21.0: rke2-cis-1.20-profile-permissive
1313
>=1.21.0: rke2-cis-1.9-profile
14-
eks: "eks-profile"
14+
eks: "eks-profile-1.5.0"
1515
gke: "gke-profile-1.6.0"
1616
aks: "aks-profile"
1717
k3s: "k3s-cis-1.9-profile"

‎chart/templates/scanprofileeks-1.5.0.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
apiVersion: cis.cattle.io/v1
3+
kind: ClusterScanProfile
4+
metadata:
5+
name: eks-profile-1.5.0
6+
annotations:
7+
clusterscanprofile.cis.cattle.io/builtin: "true"
8+
spec:
9+
benchmarkVersion: eks-1.5.0

‎chart/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
image:
66
cisoperator:
77
repository: rancher/cis-operator
8-
tag: v1.3.6
8+
tag: v1.3.7-rc.1
99
securityScan:
1010
repository: rancher/security-scan
11-
tag: v0.5.4
11+
tag: v0.5.5-rc.1
1212
sonobuoy:
1313
repository: rancher/mirrored-sonobuoy-sonobuoy
14-
tag: v0.57.2
14+
tag: v0.57.3
1515

1616
resources: {}
1717
# We usually recommend not to specify default resources and to leave this as a conscious
@@ -45,7 +45,7 @@ global:
4545
clusterName: ""
4646
kubectl:
4747
repository: rancher/kubectl
48-
tag: v1.30.7
48+
tag: v1.30.10
4949

5050
alerts:
5151
enabled: false

‎go.mod‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
module github.com/rancher/cis-operator
22

3-
go 1.23.5
4-
5-
toolchain go1.23.6
3+
go 1.23.6
64

75
// to keep dependencies in sync with rancher
86
// k8s deps bumped due to kube bench bump in security-scan
97
replace (
10-
k8s.io/api => k8s.io/api v0.31.5
11-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.5
12-
k8s.io/client-go => k8s.io/client-go v0.31.5
8+
k8s.io/api => k8s.io/api v0.31.6
9+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.6
10+
k8s.io/client-go => k8s.io/client-go v0.31.6
1311
k8s.io/gengo/v2 => k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70
1412
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
1513
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
@@ -22,14 +20,14 @@ require (
2220
github.com/prometheus/client_golang v1.21.0
2321
github.com/rancher/kubernetes-provider-detector v0.1.5
2422
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813
25-
github.com/rancher/security-scan v0.5.4
23+
github.com/rancher/security-scan v0.5.5-rc.1
2624
github.com/rancher/wrangler/v3 v3.1.0
2725
github.com/robfig/cron v1.2.0
2826
github.com/sirupsen/logrus v1.9.3
2927
github.com/urfave/cli v1.22.16
3028
golang.org/x/crypto/x509roots/fallback v0.0.0-20250228200319-bbc689cf5cfb
3129
k8s.io/api v0.32.1
32-
k8s.io/apiextensions-apiserver v0.31.5
30+
k8s.io/apiextensions-apiserver v0.31.6
3331
k8s.io/apimachinery v0.32.1
3432
k8s.io/client-go v0.32.1
3533
)
@@ -49,7 +47,7 @@ require (
4947
)
5048

5149
require (
52-
github.com/aquasecurity/kube-bench v0.10.1 // indirect
50+
github.com/aquasecurity/kube-bench v0.10.2 // indirect
5351
github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
5452
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.8 // indirect
5553
github.com/aws/smithy-go v1.22.2 // indirect
@@ -107,7 +105,7 @@ require (
107105
gopkg.in/ini.v1 v1.67.0 // indirect
108106
gopkg.in/yaml.v2 v2.4.0 // indirect
109107
gopkg.in/yaml.v3 v3.0.1 // indirect
110-
k8s.io/code-generator v0.31.5 // indirect
108+
k8s.io/code-generator v0.31.6 // indirect
111109
k8s.io/gengo v0.0.0-20240826214909-a7b603a56eb7 // indirect
112110
k8s.io/klog/v2 v2.130.1 // indirect
113111
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect

‎go.sum‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2
33
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
44
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
55
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
6-
github.com/aquasecurity/kube-bench v0.10.1 h1:SLnScd5qnlSOETodhX4iyW4beu0Ue4au1MqJ3fUDnw0=
7-
github.com/aquasecurity/kube-bench v0.10.1/go.mod h1:9S67UPnASLor5+11UeikBoiG//tel5BDsei0Bo8g2Pw=
6+
github.com/aquasecurity/kube-bench v0.10.2 h1:wVU6K/g3LJD/BAlDrphLYxs9f5PNRcon+ozZ6S/fMVU=
7+
github.com/aquasecurity/kube-bench v0.10.2/go.mod h1:TYImH07Qr2XA09VCBUiQDs6vilbTyourr0B+qq/AtN8=
88
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
99
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
1010
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
@@ -252,8 +252,8 @@ github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM
252252
github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0=
253253
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813 h1:V/LY8pUHZG9Kc+xEDWDOryOnCU6/Q+Lsr9QQEQnshpU=
254254
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813/go.mod h1:IxgTBO55lziYhTEETyVKiT8/B5Rg92qYiRmcIIYoPgI=
255-
github.com/rancher/security-scan v0.5.4 h1:llg69uTonGxShVe7PmhjqJu0g4O0JnJeZ3gyDaGRYwY=
256-
github.com/rancher/security-scan v0.5.4/go.mod h1:LS57VSm7BMu+KMB2l/KvVfLD+uuXzgHO76WvAHorQIo=
255+
github.com/rancher/security-scan v0.5.5-rc.1 h1:Q9DRwwSOkBW21TLUj7CdNGPNDAtKT8rqeTQ3Ck2K/yQ=
256+
github.com/rancher/security-scan v0.5.5-rc.1/go.mod h1:1Q3NK94YVfW0/83+wmi/YsC6z0R7guWBq78Cd3B/f1c=
257257
github.com/rancher/wrangler/v3 v3.1.0 h1:8ETBnQOEcZaR6WBmUSysWW7WnERBOiNTMJr4Dj3UG/s=
258258
github.com/rancher/wrangler/v3 v3.1.0/go.mod h1:gUPHS1ANs2NyByfeERHwkGiQ1rlIa8BpTJZtNSgMlZw=
259259
github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
@@ -577,20 +577,20 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C
577577
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
578578
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
579579
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
580-
k8s.io/api v0.31.5 h1:7jP74egbPUOCLJV5KheUnwo9gz3zzUsMIj2EPkuYK1E=
581-
k8s.io/api v0.31.5/go.mod h1:RMyMdZG1kJjou2ng5buEti0OHlo0uFXgSzTZ/k5LeVk=
582-
k8s.io/apiextensions-apiserver v0.31.5 h1:50+b/hHx4nyvQ+gaFH7p5myPEZyekGhGGAQb4vnBUlQ=
583-
k8s.io/apiextensions-apiserver v0.31.5/go.mod h1:6vZ7IIlk3l7GSFcbaNz5CEYpUBLsQ0ee+LgLGOsExWQ=
584-
k8s.io/apimachinery v0.31.5 h1:NxhAVGcfrSdTMx3M2v1OnvcMS7h1ZnWyt2x2z8CJJBU=
585-
k8s.io/apimachinery v0.31.5/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
586-
k8s.io/apiserver v0.31.5 h1:n0daI1zIb+G2Jkzqjm2NQJSJfTKccgFeHHQM4LYsz7E=
587-
k8s.io/apiserver v0.31.5/go.mod h1:SboTZ2NHCsXjAHqTrE/kDTnrzquVY5mDKNnoCdRFLJw=
588-
k8s.io/client-go v0.31.5 h1:rmDswcUaIFAJ5vJaB82pjyqc52DgHCPv0G6af3OupO0=
589-
k8s.io/client-go v0.31.5/go.mod h1:js93IlRSzRHql9o9zP54N56rMR249uH4+srnSOcFLsU=
590-
k8s.io/code-generator v0.31.5 h1:nEvmAhA0tiaoHqS3ZsW/SjbGdzex4TzOlicVPoSVG8E=
591-
k8s.io/code-generator v0.31.5/go.mod h1:svmu9SPsjrNeC/T/nilkqsI0KWnC8XUandi9ECMNqRo=
592-
k8s.io/component-base v0.31.5 h1:kpFiy1hI7F4Owp+o59H2CVLzmN94qwcPz+2L6wRhkqM=
593-
k8s.io/component-base v0.31.5/go.mod h1:OiiusrmcLz42i9VvcAd94yQIN7UzQHJxN/hXxwYzj6E=
580+
k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg=
581+
k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4=
582+
k8s.io/apiextensions-apiserver v0.31.6 h1:v9sqyWlrgFZpAPdEb/bEiXfM98TfSppwRF0X/uWKXh0=
583+
k8s.io/apiextensions-apiserver v0.31.6/go.mod h1:QVH3CFwqzGZtwsxPYzJlA/Qiwgb5FXmRMGls3CjzvbI=
584+
k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
585+
k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
586+
k8s.io/apiserver v0.31.6 h1:FEhEGLsz1PbMOHeQZDbOUlMh36zRZbjgKwJCoMhdGmw=
587+
k8s.io/apiserver v0.31.6/go.mod h1:dpFh+xqFQ02O8vLYCIqoiV7sJIpZsUULeNuag6Y9HGo=
588+
k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4=
589+
k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY=
590+
k8s.io/code-generator v0.31.6 h1:CX4/NGV5UIdt7+nYG/G4+eGHOvcXAlKWswUhPPOtPtc=
591+
k8s.io/code-generator v0.31.6/go.mod h1:vbqDrvP5hJJ5S/jzBtyMJoH5kJBWZMo/DZwMYiOQniE=
592+
k8s.io/component-base v0.31.6 h1:FgI25PuZtCp2n7AFpOaDpMQOLieFdrpAbpeoZu7VhDI=
593+
k8s.io/component-base v0.31.6/go.mod h1:aVRrh8lAI1kSShFmwcKLhc3msQoUcmFWPBDf0sXaISM=
594594
k8s.io/gengo v0.0.0-20240826214909-a7b603a56eb7 h1:HCbtr1pVu/ElMcTTs18KdMtH5y6f7PQvrjh1QZj3qCI=
595595
k8s.io/gengo v0.0.0-20240826214909-a7b603a56eb7/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
596596
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=

‎hack/make/deps.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ GOLANGCI_VERSION = v1.64.6
33
# renovate: datasource=github-release-attachments depName=k3d-io/k3d
44
K3D_VERSION = v5.8.3
55

6-
KUBECTL_VERSION = 1.30.7
6+
KUBECTL_VERSION = 1.30.10
77
# renovate: datasource=github-release-attachments depName=helm/helm
88
HELM_VERSION = v3.17.1

0 commit comments

Comments
 (0)