Skip to content

Commit 87e2c28

Browse files
vardhaman22vardhaman22
authored
Merge pull request #521 from vardhaman22/v1.3/k3s-cis-1.9
[release/v1.3] added cis 1.9 generic and cis 1.9 k3s profiles
2 parents e1229dc + 4d0a519 commit 87e2c28

12 files changed

+57
-18
lines changed

Diff for: ‎chart/Chart.yaml

+2-2
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.0.1
15+
appVersion: v7.1.0
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.0.1
22+
version: 7.1.0

Diff for: ‎chart/app-readme.md

+13-11
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@ This chart installs the following components:
1818

1919
| Source | Kubernetes distribution | scan profile | Kubernetes versions |
2020
|--------|-------------------------|--------------------------------------------------------------------------------------------------------------------|---------------------|
21-
| CIS | any | [cis-1.8](https://github.com/rancher/security-scan/tree/master/package/cfg/cis-1.8) | v1.26+ |
22-
| CIS | rke | [rke-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/master/package/cfg/rke-cis-1.8-permissive) | rke1-v1.26+ |
23-
| CIS | rke | [rke-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/master/package/cfg/rke-cis-1.8-hardened) | rke1-v1.26+ |
24-
| CIS | rke2 | [rke2-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/master/package/cfg/rke2-cis-1.8-permissive)| rke2-v1.26+ |
25-
| CIS | rke2 | [rke2-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/master/package/cfg/rke2-cis-1.8-hardened) | rke2-v1.26+ |
26-
| CIS | k3s | [k3s-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/master/package/cfg/k3s-cis-1.8-permissive) | k3s-v1.26+ |
27-
| CIS | k3s | [k3s-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/master/package/cfg/k3s-cis-1.8-hardened) | k3s-v1.26+ |
28-
| CIS | eks | eks-1.2.0 | eks |
29-
| CIS | aks | aks-1.0 | aks |
30-
| CIS | gke | gke-1.2.0 | gke |
31-
| CIS | gke | gke-1.6.0 | gke-1.29+ |
21+
| CIS | any | [cis-1.9](https://github.com/aquasecurity/kube-bench/tree/main/cfg/cis-1.9) | v1.27+ |
22+
| CIS | any | [cis-1.8](https://github.com/aquasecurity/kube-bench/tree/main/cfg/cis-1.8) | v1.26 |
23+
| CIS | rke | [rke-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/rke-cis-1.8-permissive) | rke1-v1.26+ |
24+
| CIS | rke | [rke-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/rke-cis-1.8-hardened) | rke1-v1.26+ |
25+
| CIS | rke2 | [rke2-cis-1.8-permissive](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/rke2-cis-1.8-permissive) | rke2-v1.26+ |
26+
| CIS | rke2 | [rke2-cis-1.8-hardened](https://github.com/rancher/security-scan/tree/release/v0.5/package/cfg/rke2-cis-1.8-hardened) | rke2-v1.26+ |
27+
| 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+ |
28+
| 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 |
29+
| 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 |
30+
| CIS | eks | [eks-1.2.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/eks-1.2.0) | eks |
31+
| CIS | aks | [aks-1.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/aks-1.0) | aks |
32+
| CIS | gke | [gke-1.2.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/gke-1.2.0) | gke-1.20 |
33+
| CIS | gke | [gke-1.6.0](https://github.com/aquasecurity/kube-bench/tree/main/cfg/gke-1.6.0) | gke-1.29+ |

Diff for: ‎chart/templates/benchmark-cis-1.8.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ metadata:
66
spec:
77
clusterProvider: ""
88
minKubernetesVersion: "1.26.0"
9+
maxKubernetesVersion: "1.26.x"

Diff for: ‎chart/templates/benchmark-cis-1.9.yaml

+8
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: cis-1.9
6+
spec:
7+
clusterProvider: ""
8+
minKubernetesVersion: "1.27.0"

Diff for: ‎chart/templates/benchmark-k3s-cis-1.8-hardened.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ metadata:
66
spec:
77
clusterProvider: k3s
88
minKubernetesVersion: "1.26.0"
9+
maxKubernetesVersion: "1.26.x"

Diff for: ‎chart/templates/benchmark-k3s-cis-1.8-permissive.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ metadata:
66
spec:
77
clusterProvider: k3s
88
minKubernetesVersion: "1.26.0"
9+
maxKubernetesVersion: "1.26.x"

Diff for: ‎chart/templates/benchmark-k3s-cis-1.9.yaml

+8
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: k3s-cis-1.9
6+
spec:
7+
clusterProvider: k3s
8+
minKubernetesVersion: "1.27.0"

Diff for: ‎chart/templates/configmap.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ data:
1414
eks: "eks-profile"
1515
gke: "gke-profile-1.6.0"
1616
aks: "aks-profile"
17-
k3s: "k3s-cis-1.8-profile-permissive"
18-
default: "cis-1.8-profile"
17+
k3s: "k3s-cis-1.9-profile"
18+
default: "cis-1.9-profile"

Diff for: ‎chart/templates/scanprofile-cis-1.9.yaml

+9
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: cis-1.9-profile
6+
annotations:
7+
clusterscanprofile.cis.cattle.io/builtin: "true"
8+
spec:
9+
benchmarkVersion: cis-1.9

Diff for: ‎chart/templates/scanprofile-k3s-cis-1.9.yaml

+9
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: k3s-cis-1.9-profile
6+
annotations:
7+
clusterscanprofile.cis.cattle.io/builtin: "true"
8+
spec:
9+
benchmarkVersion: k3s-cis-1.9

Diff for: ‎chart/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
image:
66
cisoperator:
77
repository: rancher/cis-operator
8-
tag: v1.3.1
8+
tag: v1.3.2
99
securityScan:
1010
repository: rancher/security-scan
11-
tag: v0.5.1
11+
tag: v0.5.2
1212
sonobuoy:
1313
repository: rancher/mirrored-sonobuoy-sonobuoy
1414
tag: v0.57.2

Diff for: ‎tests/k3s-bench-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ metadata:
44
name: k3s-e2e-scan
55
namespace: cis-operator-system
66
spec:
7-
scanProfileName: k3s-cis-1.8-profile-permissive
7+
scanProfileName: k3s-cis-1.9-profile
88
scoreWarning: pass

0 commit comments

Comments
 (0)