Use semver versioning for default OperatingSystemProfiles (#128)

Signed-off-by: Waleed Malik <[email protected]>
kubermatic · Jan 13, 2022 · f039fa9 · f039fa9
1 parent eb6aca1
commit f039fa9
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 6 deletions.
diff --git a/deploy/crd/crd-operating-system-profile.yaml b/deploy/crd/crd-operating-system-profile.yaml
@@ -252,3 +252,4 @@ spec:
                 version:
                   description: Version is the version of the operating System Profile
                   type: string
+                  pattern: v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
diff --git a/deploy/osps/default/osp-amzn2.yaml b/deploy/osps/default/osp-amzn2.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: "amzn2"
   osVersion: "2.0"
-  version: "1.0.0"
+  version: "v0.1.0"
   supportedCloudProviders:
     - name: "aws"
   supportedContainerRuntimes:

diff --git a/deploy/osps/default/osp-centos.yaml b/deploy/osps/default/osp-centos.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: "centos"
   osVersion: "7.7"
-  version: "1.0.0"
+  version: "v0.1.0"
   supportedCloudProviders:
     - name: "aws"
     - name: "azure"

diff --git a/deploy/osps/default/osp-flatcar.yaml b/deploy/osps/default/osp-flatcar.yaml
@@ -21,7 +21,7 @@ spec:
   osName: flatcar
   ## Flatcar Stable (09/11/2021)
   osVersion: "2983.2.0"
-  version: "1.0.0"
+  version: "v0.1.0"
   supportedCloudProviders:
     - name: aws
     - name: azure

diff --git a/deploy/osps/default/osp-rhel.yaml b/deploy/osps/default/osp-rhel.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: "rhel"
   osVersion: "8.4"
-  version: "1.0.0"
+  version: "v0.1.0"
   supportedCloudProviders:
     - name: "aws"
     - name: "azure"

diff --git a/deploy/osps/default/osp-sles.yaml b/deploy/osps/default/osp-sles.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: sles
   osVersion: "15-SP-1"
-  version: "1.0.0"
+  version: "v0.1.0"
   supportedCloudProviders:
     - name: aws
   supportedContainerRuntimes:

diff --git a/deploy/osps/default/osp-ubuntu.yaml b/deploy/osps/default/osp-ubuntu.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   osName: "ubuntu"
   osVersion: "20.04"
-  version: "1.0.0"
+  version: "v0.1.0"
   supportedCloudProviders:
     - name: "aws"
     - name: "azure"

diff --git a/pkg/crd/osm/v1alpha1/operatingsystemprofile_types.go b/pkg/crd/osm/v1alpha1/operatingsystemprofile_types.go
@@ -47,6 +47,7 @@ type OperatingSystemProfileSpec struct {
 	// OSVersion the version of the operating system
 	OSVersion string `json:"osVersion"`
 	// Version is the version of the operating System Profile
+	// +kubebuilder:validation:Pattern=`v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`
 	Version string `json:"version"`
 	// SupportedCloudProviders represent the cloud providers that support the given operating system version
 	SupportedCloudProviders []CloudProviderSpec `json:"supportedCloudProviders"`