Skip to content

Commit fa4ccc3

Browse files
vardhaman22vardhaman22
authored
Merge pull request #658 from vardhaman22/eks-1.5.0
[main] eks 1.5.0 and k8s 1.32 support
2 parents 84daef8 + e9bab9e commit fa4ccc3

File tree

11 files changed

+69
-28
lines changed

11 files changed

+69
-28
lines changed

‎.github/renovate.json‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"main",
77
"release/v1.1",
88
"release/v1.2",
9-
"release/v1.3"
9+
"release/v1.3",
10+
"release/v1.4"
1011
],
1112
"ignoreDeps":[
1213
"github.com/rancher/lasso"
@@ -16,6 +17,18 @@
1617
{
1718
"matchBaseBranches": [
1819
"main",
20+
"release/v1.4"
21+
],
22+
"matchDepNames": [
23+
"k8s.io/api",
24+
"k8s.io/apiextensions-apiserver",
25+
"k8s.io/apimachinery",
26+
"k8s.io/client-go"
27+
],
28+
"allowedVersions": "<0.33.0"
29+
},
30+
{
31+
"matchBaseBranches": [
1932
"release/v1.3"
2033
],
2134
"matchDepNames": [
@@ -26,6 +39,15 @@
2639
],
2740
"allowedVersions": "<0.32.0"
2841
},
42+
{
43+
"matchBaseBranches": [
44+
"release/v1.4"
45+
],
46+
"matchDepNames": [
47+
"github.com/rancher/security-scan"
48+
],
49+
"allowedVersions": "<v0.7.0"
50+
},
2951
{
3052
"matchBaseBranches": [
3153
"release/v1.3"
@@ -72,7 +94,8 @@
7294
{
7395
"matchBaseBranches": ["release/v1.3"],
7496
"matchDepNames": [
75-
"github.com/prometheus-operator/prometheus-operator"
97+
"github.com/prometheus-operator/prometheus-operator/pkg/client",
98+
"github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring"
7699
],
77100
"allowedVersions": "<v0.79.0"
78101
},
@@ -82,7 +105,8 @@
82105
"release/v1.2"
83106
],
84107
"matchDepNames": [
85-
"github.com/prometheus-operator/prometheus-operator"
108+
"github.com/prometheus-operator/prometheus-operator/pkg/client",
109+
"github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring"
86110
],
87111
"allowedVersions": "<v0.75.0"
88112
},

‎chart/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ annotations:
22
catalog.cattle.io/auto-install: rancher-cis-benchmark-crd=match
33
catalog.cattle.io/certified: rancher
44
catalog.cattle.io/display-name: CIS Benchmark
5-
catalog.cattle.io/kube-version: '>= 1.28.0-0 < 1.32.0-0'
5+
catalog.cattle.io/kube-version: '>= 1.30.0-0 < 1.33.0-0'
66
catalog.cattle.io/namespace: cis-operator-system
77
catalog.cattle.io/os: linux
88
catalog.cattle.io/permits-os: linux,windows
99
catalog.cattle.io/provides-gvr: cis.cattle.io.clusterscans/v1
10-
catalog.cattle.io/rancher-version: '>= 2.10.0-0 < 2.11.0-0'
10+
catalog.cattle.io/rancher-version: '>= 2.11.0-0 < 2.12.0-0'
1111
catalog.cattle.io/release-name: rancher-cis-benchmark
1212
catalog.cattle.io/type: cluster-tool
1313
catalog.cattle.io/ui-component: rancher-cis-benchmark

‎chart/app-readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ This chart installs the following components:
2929
| 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+ |
3030
| 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 |
3131
| 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 |
32+
| CIS | eks | [eks-1.5.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/eks-1.5.0) | eks-1.27.0+ |
3233
| CIS | eks | [eks-1.2.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/eks-1.2.0) | eks |
3334
| CIS | aks | [aks-1.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/aks-1.0) | aks |
3435
| 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ image:
88
tag: v1.4.0-rc.1
99
securityScan:
1010
repository: rancher/security-scan
11-
tag: v0.5.4-rc.1
11+
tag: v0.6.0-rc.2
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

‎go.mod‎

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

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

75
require (
86
github.com/blang/semver v3.5.1+incompatible
@@ -11,7 +9,7 @@ require (
119
github.com/prometheus/client_golang v1.21.0
1210
github.com/rancher/kubernetes-provider-detector v0.1.5
1311
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813
14-
github.com/rancher/security-scan v0.5.4-rc.1
12+
github.com/rancher/security-scan v0.6.0-rc.2
1513
github.com/rancher/wrangler/v3 v3.1.0
1614
github.com/robfig/cron v1.2.0
1715
github.com/sirupsen/logrus v1.9.3
@@ -24,10 +22,10 @@ require (
2422
)
2523

2624
require (
27-
github.com/aquasecurity/kube-bench v0.10.0 // indirect
28-
github.com/aws/aws-sdk-go-v2 v1.32.8 // indirect
29-
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.3 // indirect
30-
github.com/aws/smithy-go v1.22.1 // indirect
25+
github.com/aquasecurity/kube-bench v0.10.2 // indirect
26+
github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
27+
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.8 // indirect
28+
github.com/aws/smithy-go v1.22.2 // indirect
3129
github.com/beorn7/perks v1.0.1 // indirect
3230
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3331
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
1717
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
1818
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
1919
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
20-
github.com/aquasecurity/kube-bench v0.10.0 h1:n73bFWxLnEe0uwVj3vTWFiQgNjktC/RcZOVWIrUD+10=
21-
github.com/aquasecurity/kube-bench v0.10.0/go.mod h1:PWWG09U9N70QG/BsUqltrB8gj1fhkWu8mCKjz77p79g=
20+
github.com/aquasecurity/kube-bench v0.10.2 h1:wVU6K/g3LJD/BAlDrphLYxs9f5PNRcon+ozZ6S/fMVU=
21+
github.com/aquasecurity/kube-bench v0.10.2/go.mod h1:TYImH07Qr2XA09VCBUiQDs6vilbTyourr0B+qq/AtN8=
2222
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
2323
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
24-
github.com/aws/aws-sdk-go-v2 v1.32.8 h1:cZV+NUS/eGxKXMtmyhtYPJ7Z4YLoI/V8bkTdRZfYhGo=
25-
github.com/aws/aws-sdk-go-v2 v1.32.8/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
26-
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.3 h1:TQ0sua3BwzGqHgEao1IwvJ8PAJ+OZPgJ5ByVU7vm314=
27-
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.3/go.mod h1:6qzlBXc2heuoYIo9eU7/6klKvZKqhADl7Ceh0gp5jCg=
28-
github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
29-
github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
24+
github.com/aws/aws-sdk-go-v2 v1.36.0 h1:b1wM5CcE65Ujwn565qcwgtOTT1aT4ADOHHgglKjG7fk=
25+
github.com/aws/aws-sdk-go-v2 v1.36.0/go.mod h1:5PMILGVKiW32oDzjj6RU52yrNrDPUHcbZQYr1sM7qmM=
26+
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.8 h1:+0McIKnas9knQ+22C0fS5j1j4J4wlCvnjMPzvdgVrvQ=
27+
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.8/go.mod h1:Fab1AoG6jUpxrpAmv9EXzBg19EoJcvnwSIc/oDrEE2o=
28+
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
29+
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
3030
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
3131
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
3232
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
@@ -227,8 +227,8 @@ github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM
227227
github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0=
228228
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813 h1:V/LY8pUHZG9Kc+xEDWDOryOnCU6/Q+Lsr9QQEQnshpU=
229229
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813/go.mod h1:IxgTBO55lziYhTEETyVKiT8/B5Rg92qYiRmcIIYoPgI=
230-
github.com/rancher/security-scan v0.5.4-rc.1 h1:ZXonAI5++1ns9o64foRkObqkivt/a7mVtTKrXkVW6uM=
231-
github.com/rancher/security-scan v0.5.4-rc.1/go.mod h1:HDHaXT6LJKVSEvxC2NW8dm5RsvLP5nAb32739vPdjCc=
230+
github.com/rancher/security-scan v0.6.0-rc.2 h1:2aqWuaALFV/W9p96hm0UWurTyKnlxScaMIp7UA8nJQA=
231+
github.com/rancher/security-scan v0.6.0-rc.2/go.mod h1:1Q3NK94YVfW0/83+wmi/YsC6z0R7guWBq78Cd3B/f1c=
232232
github.com/rancher/wrangler/v3 v3.1.0 h1:8ETBnQOEcZaR6WBmUSysWW7WnERBOiNTMJr4Dj3UG/s=
233233
github.com/rancher/wrangler/v3 v3.1.0/go.mod h1:gUPHS1ANs2NyByfeERHwkGiQ1rlIa8BpTJZtNSgMlZw=
234234
github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=

0 commit comments

Comments
 (0)