Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ annotations:
catalog.cattle.io/type: cluster-tool
catalog.cattle.io/ui-component: rancher-cis-benchmark
apiVersion: v1
appVersion: v8.1.0
appVersion: v8.2.0-rc.1
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: 8.1.0
version: 8.2.0-rc.1
8 changes: 8 additions & 0 deletions chart/templates/benchmark-cis-1.10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanBenchmark
metadata:
name: cis-1.10
spec:
clusterProvider: ""
minKubernetesVersion: "1.28.0"
1 change: 1 addition & 0 deletions chart/templates/benchmark-cis-1.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: ""
minKubernetesVersion: "1.27.0"
maxKubernetesVersion: "1.27.x"
8 changes: 8 additions & 0 deletions chart/templates/benchmark-k3s-cis-1.10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanBenchmark
metadata:
name: k3s-cis-1.10
spec:
clusterProvider: k3s
minKubernetesVersion: "1.28.0"
1 change: 1 addition & 0 deletions chart/templates/benchmark-k3s-cis-1.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: k3s
minKubernetesVersion: "1.27.0"
maxKubernetesVersion: "1.27.x"
8 changes: 8 additions & 0 deletions chart/templates/benchmark-rke2-cis-1.10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanBenchmark
metadata:
name: rke2-cis-1.10
spec:
clusterProvider: rke2
minKubernetesVersion: "1.28.0"
1 change: 1 addition & 0 deletions chart/templates/benchmark-rke2-cis-1.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: rke2
minKubernetesVersion: "1.27.0"
maxKubernetesVersion: "1.27.x"
6 changes: 3 additions & 3 deletions chart/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ data:
>=1.21.0: rke-profile-permissive-1.8
rke2: |-
<1.21.0: rke2-cis-1.20-profile-permissive
>=1.21.0: rke2-cis-1.9-profile
>=1.21.0: rke2-cis-1.10-profile
eks: "eks-profile-1.5.0"
gke: "gke-profile-1.6.0"
aks: "aks-profile"
k3s: "k3s-cis-1.9-profile"
default: "cis-1.9-profile"
k3s: "k3s-cis-1.10-profile"
default: "cis-1.10-profile"
9 changes: 9 additions & 0 deletions chart/templates/scanprofile-cis-1.10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanProfile
metadata:
name: cis-1.10-profile
annotations:
clusterscanprofile.cis.cattle.io/builtin: "true"
spec:
benchmarkVersion: cis-1.10
9 changes: 9 additions & 0 deletions chart/templates/scanprofile-k3s-cis-1.10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanProfile
metadata:
name: k3s-cis-1.10-profile
annotations:
clusterscanprofile.cis.cattle.io/builtin: "true"
spec:
benchmarkVersion: k3s-cis-1.10
9 changes: 9 additions & 0 deletions chart/templates/scanprofile-rke2-cis-1.10.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanProfile
metadata:
name: rke2-cis-1.10-profile
annotations:
clusterscanprofile.cis.cattle.io/builtin: "true"
spec:
benchmarkVersion: rke2-cis-1.10
2 changes: 1 addition & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ image:
tag: v1.4.1
securityScan:
repository: rancher/security-scan
tag: v0.6.1
tag: v0.6.2-rc.2
sonobuoy:
repository: rancher/mirrored-sonobuoy-sonobuoy
tag: v0.57.3
Expand Down
2 changes: 1 addition & 1 deletion tests/k3s-bench-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ metadata:
name: k3s-e2e-scan
namespace: cis-operator-system
spec:
scanProfileName: k3s-cis-1.9-profile
scanProfileName: k3s-cis-1.10-profile
scoreWarning: pass
Loading