update version in benchmark,remove 1.5 scanprofile

pull/2053/head
mitulshah-suse 2022-08-26 18:55:40 +05:30
parent a36d2ba747
commit 60f61ebef4
35 changed files with 39 additions and 62 deletions

View File

@ -7,7 +7,7 @@ annotations:
catalog.cattle.io/os: linux
catalog.cattle.io/permits-os: linux,windows
catalog.cattle.io/provides-gvr: cis.cattle.io.clusterscans/v1
catalog.cattle.io/rancher-version: '>= 2.6.0-0 < 2.7.0-0'
catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
catalog.cattle.io/release-name: rancher-cis-benchmark
catalog.cattle.io/type: cluster-tool
catalog.cattle.io/ui-component: rancher-cis-benchmark

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: ""
minKubernetesVersion: "1.19.0"
maxKubernetesVersion: "1.21.x"

View File

@ -5,4 +5,4 @@ metadata:
name: cis-1.23
spec:
clusterProvider: ""
minKubernetesVersion: "1.21.0"
minKubernetesVersion: "1.22.0"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: ""
minKubernetesVersion: "1.15.0"
maxKubernetesVersion: "1.15.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: ""
minKubernetesVersion: "1.16.0"
maxKubernetesVersion: "1.18.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: k3s
minKubernetesVersion: "1.19.0"
maxKubernetesVersion: "1.21.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: k3s
minKubernetesVersion: "1.19.0"
maxKubernetesVersion: "1.21.x"

View File

@ -5,4 +5,4 @@ metadata:
name: k3s-cis-1.23-hardened
spec:
clusterProvider: k3s
minKubernetesVersion: "1.21.0"
minKubernetesVersion: "1.22.0"

View File

@ -5,4 +5,4 @@ metadata:
name: k3s-cis-1.23-permissive
spec:
clusterProvider: k3s
minKubernetesVersion: "1.21.0"
minKubernetesVersion: "1.22.0"

View File

@ -5,4 +5,5 @@ metadata:
name: k3s-cis-1.6-hardened
spec:
clusterProvider: k3s
minKubernetesVersion: "1.20.5"
minKubernetesVersion: "1.16.0"
maxKubernetesVersion: "1.18.x"

View File

@ -5,4 +5,5 @@ metadata:
name: k3s-cis-1.6-permissive
spec:
clusterProvider: k3s
minKubernetesVersion: "1.20.5"
minKubernetesVersion: "1.16.0"
maxKubernetesVersion: "1.18.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: rke
minKubernetesVersion: "1.19.0"
maxKubernetesVersion: "1.21.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: rke
minKubernetesVersion: "1.19.0"
maxKubernetesVersion: "1.21.x"

View File

@ -5,4 +5,4 @@ metadata:
name: rke-cis-1.23-hardened
spec:
clusterProvider: rke
minKubernetesVersion: "1.21.0"
minKubernetesVersion: "1.22.0"

View File

@ -5,4 +5,4 @@ metadata:
name: rke-cis-1.23-permissive
spec:
clusterProvider: rke
minKubernetesVersion: "1.21.0"
minKubernetesVersion: "1.22.0"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: rke
minKubernetesVersion: "1.15.0"
maxKubernetesVersion: "1.15.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: rke
minKubernetesVersion: "1.15.0"
maxKubernetesVersion: "1.15.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: rke
minKubernetesVersion: "1.16.0"
maxKubernetesVersion: "1.18.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: rke
minKubernetesVersion: "1.16.0"
maxKubernetesVersion: "1.18.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: rke2
minKubernetesVersion: "1.19.0"
maxKubernetesVersion: "1.21.x"

View File

@ -6,3 +6,4 @@ metadata:
spec:
clusterProvider: rke2
minKubernetesVersion: "1.19.0"
maxKubernetesVersion: "1.21.x"

View File

@ -5,4 +5,4 @@ metadata:
name: rke2-cis-1.23-hardened
spec:
clusterProvider: rke2
minKubernetesVersion: "1.21.0"
minKubernetesVersion: "1.22.0"

View File

@ -5,4 +5,4 @@ metadata:
name: rke2-cis-1.23-permissive
spec:
clusterProvider: rke2
minKubernetesVersion: "1.21.0"
minKubernetesVersion: "1.22.0"

View File

@ -5,4 +5,5 @@ metadata:
name: rke2-cis-1.5-hardened
spec:
clusterProvider: rke2
minKubernetesVersion: "1.18.0"
minKubernetesVersion: "1.15.0"
maxKubernetesVersion: "1.15.x"

View File

@ -5,4 +5,5 @@ metadata:
name: rke2-cis-1.5-permissive
spec:
clusterProvider: rke2
minKubernetesVersion: "1.18.0"
minKubernetesVersion: "1.15.0"
maxKubernetesVersion: "1.15.x"

View File

@ -5,4 +5,5 @@ metadata:
name: rke2-cis-1.6-hardened
spec:
clusterProvider: rke2
minKubernetesVersion: "1.20.5"
minKubernetesVersion: "1.16.0"
maxKubernetesVersion: "1.18.x"

View File

@ -5,4 +5,5 @@ metadata:
name: rke2-cis-1.6-permissive
spec:
clusterProvider: rke2
minKubernetesVersion: "1.20.5"
minKubernetesVersion: "1.16.0"
maxKubernetesVersion: "1.18.x"

View File

@ -1,9 +0,0 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanProfile
metadata:
name: cis-1.5-profile
annotations:
clusterscanprofile.cis.cattle.io/builtin: "true"
spec:
benchmarkVersion: cis-1.5

View File

@ -1,9 +0,0 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanProfile
metadata:
name: rke-profile-hardened-1.5
annotations:
clusterscanprofile.cis.cattle.io/builtin: "true"
spec:
benchmarkVersion: rke-cis-1.5-hardened

View File

@ -1,9 +0,0 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanProfile
metadata:
name: rke-profile-permissive-1.5
annotations:
clusterscanprofile.cis.cattle.io/builtin: "true"
spec:
benchmarkVersion: rke-cis-1.5-permissive

View File

@ -1,9 +0,0 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanProfile
metadata:
name: rke2-cis-1.5-profile-hardened
annotations:
clusterscanprofile.cis.cattle.io/builtin: "true"
spec:
benchmarkVersion: rke2-cis-1.5-hardened

View File

@ -1,9 +0,0 @@
---
apiVersion: cis.cattle.io/v1
kind: ClusterScanProfile
metadata:
name: rke2-cis-1.5-profile-permissive
annotations:
clusterscanprofile.cis.cattle.io/builtin: "true"
spec:
benchmarkVersion: rke2-cis-1.5-permissive

View File

@ -8,7 +8,7 @@ image:
tag: v1.0.9
securityScan:
repository: rancher/security-scan
tag: v0.2.8
tag: v0.2.9-rc1
sonobuoy:
repository: rancher/mirrored-sonobuoy-sonobuoy
tag: v0.56.7

View File

@ -1,6 +1,5 @@
url: local
version: 3.0.0
doNotRelease: true
version: 3.0.0-rc1
additionalCharts:
- workingDir: charts-crd
crdOptions:

View File

@ -14,3 +14,7 @@ rancher-backup-crd:
- 2.1.4-rc1
rancher-webhook:
- 1.0.6+up0.2.7-rc4
rancher-cis-benchmark:
- 3.0.0-rc1
rancher-cis-benchmark-crd:
- 3.0.0-rc1