From 04e2a2b343455452363f9ce1011b7d69bb07334c Mon Sep 17 00:00:00 2001 From: Danil-Grigorev Date: Tue, 25 Jun 2024 17:45:53 +0200 Subject: [PATCH] Fix regex to support more then one patch version number Signed-off-by: Danil-Grigorev --- controlplane/api/v1beta1/rke2controlplane_types.go | 2 +- .../bases/controlplane.cluster.x-k8s.io_rke2controlplanes.yaml | 2 +- ...controlplane.cluster.x-k8s.io_rke2controlplanetemplates.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controlplane/api/v1beta1/rke2controlplane_types.go b/controlplane/api/v1beta1/rke2controlplane_types.go index 976e88df..b68fb7f8 100644 --- 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 index 01471d3f..b4ad14f5 100644 --- 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 index c4bbf27e..257aae86 100644 --- 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