add cis to the cis-profile enum

rancher · Apr 18, 2024 · bcc1aa9 · bcc1aa9
1 parent 4756c2a
commit bcc1aa9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/bootstrap/api/v1beta1/rke2config_types.go b/bootstrap/api/v1beta1/rke2config_types.go
@@ -102,7 +102,7 @@ type RKE2AgentConfig struct {
 	Snapshotter string `json:"snapshotter,omitempty"`
 
 	// CISProfile activates CIS compliance of RKE2 for a certain profile
-	// +kubebuilder:validation:Enum=cis-1.23;cis-1.5;cis-1.6
+	// +kubebuilder:validation:Enum=cis;cis-1.23;cis-1.5;cis-1.6
 	//+optional
 	CISProfile CISProfile `json:"cisProfile,omitempty"`
 

diff --git a/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_rke2configs.yaml b/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_rke2configs.yaml
@@ -74,6 +74,7 @@ spec:
                     description: CISProfile activates CIS compliance of RKE2 for a
                       certain profile
                     enum:
+                    - cis
                     - cis-1.23
                     - cis-1.5
                     - cis-1.6
@@ -632,6 +633,7 @@ spec:
                     description: CISProfile activates CIS compliance of RKE2 for a
                       certain profile
                     enum:
+                    - cis
                     - cis-1.23
                     - cis-1.5
                     - cis-1.6

diff --git a/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_rke2configtemplates.yaml b/bootstrap/config/crd/bases/bootstrap.cluster.x-k8s.io_rke2configtemplates.yaml
@@ -88,6 +88,7 @@ spec:
                             description: CISProfile activates CIS compliance of RKE2
                               for a certain profile
                             enum:
+                            - cis
                             - cis-1.23
                             - cis-1.5
                             - cis-1.6
@@ -635,6 +636,7 @@ spec:
                             description: CISProfile activates CIS compliance of RKE2
                               for a certain profile
                             enum:
+                            - cis
                             - cis-1.23
                             - cis-1.5
                             - cis-1.6

diff --git a/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_rke2controlplanes.yaml b/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_rke2controlplanes.yaml
@@ -74,6 +74,7 @@ spec:
                     description: CISProfile activates CIS compliance of RKE2 for a
                       certain profile
                     enum:
+                    - cis
                     - cis-1.23
                     - cis-1.5
                     - cis-1.6
@@ -1254,6 +1255,7 @@ spec:
                     description: CISProfile activates CIS compliance of RKE2 for a
                       certain profile
                     enum:
+                    - cis
                     - cis-1.23
                     - cis-1.5
                     - cis-1.6

diff --git a/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_rke2controlplanetemplates.yaml b/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_rke2controlplanetemplates.yaml
@@ -120,6 +120,7 @@ spec:
                             description: CISProfile activates CIS compliance of RKE2
                               for a certain profile
                             enum:
+                            - cis
                             - cis-1.23
                             - cis-1.5
                             - cis-1.6