Merge pull request #353 from Danil-Grigorev/version-regex-support-2-n…

…um-patch 🐛 Fix regex to support more then one patch version number
rancher · Jul 2, 2024 · 07eef9b · 07eef9b
2 parents 3b8655d + 04e2a2b
commit 07eef9b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/controlplane/api/v1beta1/rke2controlplane_types.go b/controlplane/api/v1beta1/rke2controlplane_types.go
@@ -48,7 +48,7 @@ type RKE2ControlPlaneSpec struct {
 
 	// Version defines the desired Kubernetes version.
 	// This field takes precedence over RKE2ConfigSpec.AgentConfig.Version (which is deprecated).
-	// +kubebuilder:validation:Pattern="(v\\d\\.\\d{2}\\.\\d\\+rke2r\\d)|^$"
+	// +kubebuilder:validation:Pattern="(v\\d\\.\\d{2}\\.\\d+\\+rke2r\\d)|^$"
 	// +optional
 	Version string `json:"version"`
 

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
@@ -2446,7 +2446,7 @@ spec:
                 description: |-
                   Version defines the desired Kubernetes version.
                   This field takes precedence over RKE2ConfigSpec.AgentConfig.Version (which is deprecated).
-                pattern: (v\d\.\d{2}\.\d\+rke2r\d)|^$
+                pattern: (v\d\.\d{2}\.\d+\+rke2r\d)|^$
                 type: string
             required:
             - infrastructureRef

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
@@ -1297,7 +1297,7 @@ spec:
                         description: |-
                           Version defines the desired Kubernetes version.
                           This field takes precedence over RKE2ConfigSpec.AgentConfig.Version (which is deprecated).
-                        pattern: (v\d\.\d{2}\.\d\+rke2r\d)|^$
+                        pattern: (v\d\.\d{2}\.\d+\+rke2r\d)|^$
                         type: string
                     required:
                     - infrastructureRef