More updates for RKE2

This commit is contained in:
Petr Kovar
2025-09-26 19:34:37 +02:00
parent 887e853d1c
commit c3c513ce26
2 changed files with 21 additions and 17 deletions
@@ -26,9 +26,9 @@ An example ClusterScan custom resource is below:
apiVersion: compliance.cattle.io/v1
kind: ClusterScan
metadata:
name: rke-cis
name: scan-smnr9
spec:
scanProfileName: rke-profile-hardened
scanProfileName: cis-1.10-profile
```
## Profiles
@@ -54,16 +54,21 @@ apiVersion: compliance.cattle.io/v1
kind: ClusterScanProfile
metadata:
annotations:
meta.helm.sh/release-name: clusterscan-operator
clusterscanprofile.compliance.cattle.io/builtin: 'true'
meta.helm.sh/release-name: rancher-compliance
meta.helm.sh/release-namespace: compliance-operator-system
creationTimestamp: '2025-09-15T18:09:52Z'
generation: 1
labels:
app.kubernetes.io/managed-by: Helm
name: "<example-profile>"
name: cis-1.10-profile
resourceVersion: '93582'
uid: 0baad187-1157-46ac-982d-014338847c27
spec:
benchmarkVersion: cis-1.5
benchmarkVersion: cis-1.10
skipTests:
- "1.1.20"
- "1.1.21"
- '1.1.20'
- '1.1.21'
```
## Benchmark Versions
@@ -82,7 +87,7 @@ If the default BenchmarkVersions are edited, the next chart update will reset th
A ClusterScanBenchmark consists of the fields:
- `ClusterProvider`: This is the cluster provider name for which this benchmark is applicable. For example: RKE, EKS, GKE, etc. Leave it empty if this benchmark can be run on any cluster type.
- `ClusterProvider`: This is the cluster provider name for which this benchmark is applicable. For example: RKE2, EKS, GKE, etc. Leave it empty if this benchmark can be run on any cluster type.
- `MinKubernetesVersion`: Specifies the cluster's minimum kubernetes version necessary to run this benchmark. Leave it empty if there is no dependency on a particular Kubernetes version.
- `MaxKubernetesVersion`: Specifies the cluster's maximum Kubernetes version necessary to run this benchmark. Leave it empty if there is no dependency on a particular k8s version.
@@ -93,17 +98,16 @@ apiVersion: compliance.cattle.io/v1
kind: ClusterScanBenchmark
metadata:
annotations:
meta.helm.sh/release-name: clusterscan-operator
meta.helm.sh/release-name: rancher-compliance
meta.helm.sh/release-namespace: compliance-operator-system
creationTimestamp: "2020-08-28T18:18:07Z"
creationTimestamp: '2025-09-15T18:09:52Z'
generation: 1
labels:
app.kubernetes.io/managed-by: Helm
name: cis-1.5
resourceVersion: "203878"
selfLink: /apis/cis.cattle.io/v1/clusterscanbenchmarks/cis-1.5
name: cis-1.10
resourceVersion: '93569'
uid: 309e543e-9102-4091-be91-08d7af7fb7a7
spec:
clusterProvider: ""
minKubernetesVersion: 1.15.0
clusterProvider: ''
minKubernetesVersion: 1.28.0
```
@@ -8,11 +8,11 @@ title: Rancher Server and Components
The majority of Rancher 2.x software runs on the Rancher Server. Rancher Server includes all the software components used to manage the entire Rancher deployment.
The figure below illustrates the high-level architecture of Rancher 2.x. The figure depicts a Rancher Server installation that manages two downstream Kubernetes clusters: one created by RKE and another created by Amazon EKS (Elastic Kubernetes Service).
The diagram below illustrates the high-level architecture of Rancher 2.x. The figure depicts a Rancher Server installation that manages two downstream Kubernetes clusters: one created by RKE2 and another created by Amazon EKS (Elastic Kubernetes Service).
For the best performance and security, we recommend a dedicated Kubernetes cluster for the Rancher management server. Running user workloads on this cluster is not advised. After deploying Rancher, you can [create or import clusters](../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/kubernetes-clusters-in-rancher-setup.md) for running your workloads.
The diagram below shows how users can manipulate both [Rancher-launched Kubernetes](../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/launch-kubernetes-with-rancher.md) clusters and [hosted Kubernetes](../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/set-up-clusters-from-hosted-kubernetes-providers.md) clusters through Rancher's authentication proxy:
The diagram shows how users can manipulate both [Rancher-launched Kubernetes](../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/launch-kubernetes-with-rancher.md) clusters and [hosted Kubernetes](../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/set-up-clusters-from-hosted-kubernetes-providers.md) clusters through Rancher's authentication proxy:
<figcaption>Managing Kubernetes Clusters through Rancher's Authentication Proxy</figcaption>