Skip to content

Commit 5a94c0b

Browse files
vardhaman22vardhaman22
authored
Merge pull request #720 from vardhaman22/v1.2/eks-1.5.0
[release/v1.2] added eks-1.5.0 profile
2 parents f4af119 + 2a66c5f commit 5a94c0b

File tree

10 files changed

+34
-17
lines changed

10 files changed

+34
-17
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: v6.7.0
15+
appVersion: v6.8.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: 6.7.0
22+
version: 6.8.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.4/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.4/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.4/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.2.5
8+
tag: v1.2.6-rc.1
99
securityScan:
1010
repository: rancher/security-scan
11-
tag: v0.4.3
11+
tag: v0.4.4-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.29.11
48+
tag: v1.29.14
4949

5050
alerts:
5151
enabled: false

‎go.mod‎

Lines changed: 3 additions & 5 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.5
4-
5-
toolchain go1.23.6
3+
go 1.23.6
64

75
// pinned these to keep deps in sync with rancher
86
replace (
@@ -20,7 +18,7 @@ require (
2018
github.com/prometheus/client_golang v1.21.0
2119
github.com/rancher/kubernetes-provider-detector v0.1.5
2220
github.com/rancher/lasso v0.0.0-20240828170735-d79536cac289
23-
github.com/rancher/security-scan v0.4.3
21+
github.com/rancher/security-scan v0.4.4-rc.1
2422
github.com/robfig/cron v1.2.0
2523
github.com/sirupsen/logrus v1.9.3
2624
github.com/urfave/cli v1.22.16
@@ -37,7 +35,7 @@ require (
3735
)
3836

3937
require (
40-
github.com/aquasecurity/kube-bench v0.10.1 // indirect
38+
github.com/aquasecurity/kube-bench v0.10.2 // indirect
4139
github.com/aws/aws-sdk-go-v2 v1.36.0 // indirect
4240
github.com/aws/aws-sdk-go-v2/service/securityhub v1.55.8 // indirect
4341
github.com/aws/smithy-go v1.22.2 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -614,8 +614,8 @@ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/g
614614
github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
615615
github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI=
616616
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
617-
github.com/aquasecurity/kube-bench v0.10.1 h1:SLnScd5qnlSOETodhX4iyW4beu0Ue4au1MqJ3fUDnw0=
618-
github.com/aquasecurity/kube-bench v0.10.1/go.mod h1:9S67UPnASLor5+11UeikBoiG//tel5BDsei0Bo8g2Pw=
617+
github.com/aquasecurity/kube-bench v0.10.2 h1:wVU6K/g3LJD/BAlDrphLYxs9f5PNRcon+ozZ6S/fMVU=
618+
github.com/aquasecurity/kube-bench v0.10.2/go.mod h1:TYImH07Qr2XA09VCBUiQDs6vilbTyourr0B+qq/AtN8=
619619
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
620620
github.com/aws/aws-sdk-go-v2 v1.36.0 h1:b1wM5CcE65Ujwn565qcwgtOTT1aT4ADOHHgglKjG7fk=
621621
github.com/aws/aws-sdk-go-v2 v1.36.0/go.mod h1:5PMILGVKiW32oDzjj6RU52yrNrDPUHcbZQYr1sM7qmM=
@@ -1037,8 +1037,8 @@ github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM
10371037
github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0=
10381038
github.com/rancher/lasso v0.0.0-20240828170735-d79536cac289 h1:gbV7qLOcEgyTgep2ocl8FFhfGOUMQuvfV5OIIENHWT4=
10391039
github.com/rancher/lasso v0.0.0-20240828170735-d79536cac289/go.mod h1:Efx/+BbH3ivmnTPLu5cA3Gc9wT5oyGS0LBcqEuYTx+A=
1040-
github.com/rancher/security-scan v0.4.3 h1:m6OQlM2+sVgbKdnU++m1VWoNpPsVg5vaQSN3hNtPyFY=
1041-
github.com/rancher/security-scan v0.4.3/go.mod h1:LS57VSm7BMu+KMB2l/KvVfLD+uuXzgHO76WvAHorQIo=
1040+
github.com/rancher/security-scan v0.4.4-rc.1 h1:WOHm3+uOw0AMFqaTTz9jpuyLefAMqsEO8I3THpA/xX8=
1041+
github.com/rancher/security-scan v0.4.4-rc.1/go.mod h1:1Q3NK94YVfW0/83+wmi/YsC6z0R7guWBq78Cd3B/f1c=
10421042
github.com/rancher/wrangler/v3 v3.0.0 h1:IHHCA+vrghJDPxjtLk4fmeSCFhNe9fFzLFj3m2B0YpA=
10431043
github.com/rancher/wrangler/v3 v3.0.0/go.mod h1:Dfckuuq7MJk2JWVBDywRlZXMxEyPxHy4XqGrPEzu5Eg=
10441044
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=

‎hack/make/deps.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ GOLANGCI_VERSION = v1.64.6
44
K3D_VERSION = v5.8.3
55

66
# TODO: Bump aligned with Rancher Manager release line
7-
KUBECTL_VERSION = 1.29.11
7+
KUBECTL_VERSION = 1.29.14
88
# renovate: datasource=github-release-attachments depName=helm/helm
99
HELM_VERSION = v3.17.1

0 commit comments

Comments
 (0)