Merge pull request #19 from AOEpeople/update-machine-flavor

Update machine flavor & validation regex

Author: KevinGimbel

README.md

@@ -103,7 +103,7 @@ kubectl apply -f samples/machine.yaml
 
 | Field | Type | Required | Description |
 |-------|------|----------|-------------|
-| `machineType` | string | Yes | STACKIT server type (e.g., "c1.2", "m1.4") |
+| `machineType` | string | Yes | STACKIT server type (e.g., "c2i.2", "m2i.8") |
 | `imageId` | string | Yes | UUID of the OS image |
 | `labels` | map[string]string | No | Labels for server identification |
 | `networking` | NetworkingSpec | No | Network configuration (NetworkID or NICIDs) |

docs/stackit-iaas-api-analysis.md

@@ -50,7 +50,7 @@ Additional endpoints available (may be useful for future enhancements):
 
 ### Required Fields
 - **`name`** (string) - Server name (MCM will use Machine CR name)
-- **`machineType`** (string) - Machine/instance type (e.g., "c1.2", "m1.4")
+- **`machineType`** (string) - Machine/instance type (e.g., "c2i.2", "m2i.8")
 
 ### Optional Fields
 
@@ -136,7 +136,7 @@ Based on the API analysis, our ProviderSpec should include:
 ```go
 type ProviderSpec struct {
     // Required fields
-    MachineType string `json:"machineType"` // e.g., "c1.2", "m1.4"
+    MachineType string `json:"machineType"` // e.g., "c2i.2", "m2i.8"
 
     // Compute configuration
     ImageID          string `json:"imageId"`          // OS image UUID

pkg/provider/apis/provider_spec.go

@@ -6,7 +6,7 @@ package api
 
 // ProviderSpec is the spec to be used while parsing the calls.
 type ProviderSpec struct {
-	// MachineType is the STACKIT server type (e.g., "c1.2", "m1.4")
+	// MachineType is the STACKIT server type (e.g., "c2i.2", "m2i.8")
 	// Required field for creating a server.
 	MachineType string `json:"machineType"`
 

pkg/provider/apis/validation/validation.go

@@ -25,8 +25,8 @@ var keypairNameRegex = regexp.MustCompile(`^[A-Za-z0-9@._-]*$`)
 var emailRegex = regexp.MustCompile(`^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$`)
 
 // machineTypeRegex is a regex pattern for validating machine type format
-// Pattern: lowercase letter(s) followed by digits, dot, then more digits (e.g., c1.2, m1.4, g1a.8)
-var machineTypeRegex = regexp.MustCompile(`^[a-z]+\d+\.\d+$`)
+// Pattern: lowercase letter(s) followed by digits, dot, then more digits (e.g., c2i.2, m2i.8, g1a.8)
+var machineTypeRegex = regexp.MustCompile(`^[a-z]+\d+[a-z]*\.\d+[a-z]*(\.[a-z]+\d+)*$`)
 
 // labelKeyRegex validates Kubernetes label keys (must start/end with alphanumeric, can contain -, _, .)
 // Maximum length: 63 characters
@@ -67,7 +67,7 @@ func ValidateProviderSpecNSecret(spec *api.ProviderSpec, secrets *corev1.Secret)
 	if spec.MachineType == "" {
 		errors = append(errors, fmt.Errorf("providerSpec.machineType is required"))
 	} else if !isValidMachineType(spec.MachineType) {
-		errors = append(errors, fmt.Errorf("providerSpec.machineType has invalid format (expected format: c1.2, m1.4, etc.)"))
+		errors = append(errors, fmt.Errorf("providerSpec.machineType has invalid format (expected format: c2i.2, m2i.8, etc.)"))
 	}
 
 	// ImageID is required unless BootVolume.Source is specified

pkg/provider/apis/validation/validation_core_labels_test.go

@@ -21,7 +21,7 @@ var _ = Describe("ValidateProviderSpecNSecret", func() {
 	BeforeEach(func() {
 		// Set up valid defaults
 		providerSpec = &api.ProviderSpec{
-			MachineType: "c1.2",
+			MachineType: "c2i.2",
 			ImageID:     "550e8400-e29b-41d4-a716-446655440000",
 		}
 		secret = &corev1.Secret{
@@ -53,7 +53,7 @@ var _ = Describe("ValidateProviderSpecNSecret", func() {
 		})
 
 		It("should succeed when MachineType has valid format", func() {
-			providerSpec.MachineType = "c1.2"
+			providerSpec.MachineType = "c2i.2"
 			errors := ValidateProviderSpecNSecret(providerSpec, secret)
 			Expect(errors).To(BeEmpty())
 		})
@@ -103,8 +103,8 @@ var _ = Describe("ValidateProviderSpecNSecret", func() {
 		It("should succeed with label keys containing allowed characters", func() {
 			providerSpec.Labels = map[string]string{
 				"app.kubernetes.io_component": "worker",
-				"environment-type":             "prod",
-				"version":                      "v1.2.3",
+				"environment-type":            "prod",
+				"version":                     "v1.2.3",
 			}
 			errors := ValidateProviderSpecNSecret(providerSpec, secret)
 			Expect(errors).To(BeEmpty())

pkg/provider/apis/validation/validation_fields_test.go

@@ -21,7 +21,7 @@ var _ = Describe("ValidateProviderSpecNSecret", func() {
 	BeforeEach(func() {
 		// Set up valid defaults
 		providerSpec = &api.ProviderSpec{
-			MachineType: "c1.2",
+			MachineType: "c2i.2",
 			ImageID:     "550e8400-e29b-41d4-a716-446655440000",
 		}
 		secret = &corev1.Secret{

pkg/provider/apis/validation/validation_networking_test.go

@@ -21,7 +21,7 @@ var _ = Describe("ValidateProviderSpecNSecret", func() {
 	BeforeEach(func() {
 		// Set up valid defaults
 		providerSpec = &api.ProviderSpec{
-			MachineType: "c1.2",
+			MachineType: "c2i.2",
 			ImageID:     "550e8400-e29b-41d4-a716-446655440000",
 		}
 		secret = &corev1.Secret{

pkg/provider/apis/validation/validation_secgroup_test.go

@@ -21,7 +21,7 @@ var _ = Describe("ValidateProviderSpecNSecret", func() {
 	BeforeEach(func() {
 		// Set up valid defaults
 		providerSpec = &api.ProviderSpec{
-			MachineType: "c1.2",
+			MachineType: "c2i.2",
 			ImageID:     "550e8400-e29b-41d4-a716-446655440000",
 		}
 		secret = &corev1.Secret{

pkg/provider/apis/validation/validation_secret_test.go

@@ -21,7 +21,7 @@ var _ = Describe("ValidateProviderSpecNSecret", func() {
 	BeforeEach(func() {
 		// Set up valid defaults
 		providerSpec = &api.ProviderSpec{
-			MachineType: "c1.2",
+			MachineType: "c2i.2",
 			ImageID:     "550e8400-e29b-41d4-a716-446655440000",
 		}
 		secret = &corev1.Secret{

pkg/provider/apis/validation/validation_volumes_test.go

@@ -21,7 +21,7 @@ var _ = Describe("ValidateProviderSpecNSecret", func() {
 	BeforeEach(func() {
 		// Set up valid defaults
 		providerSpec = &api.ProviderSpec{
-			MachineType: "c1.2",
+			MachineType: "c2i.2",
 			ImageID:     "550e8400-e29b-41d4-a716-446655440000",
 		}
 		secret = &corev1.Secret{