feat: Update minikube cluster schema with memory and CPU type improvements

Author: scott-the-programmer

minikube/generator/schema_builder.go

@@ -60,6 +60,8 @@ var schemaOverrides map[string]SchemaOverride = map[string]SchemaOverride{
 		Default:          "4g",
 		Description:      "Amount of RAM to allocate to Kubernetes (format: <number>[<unit>], where unit = b, k, m or g). Use \\\"max\\\" to use the maximum amount of memory. Use \\\"no-limit\\\" to not specify a limit (Docker/Podman only))",
 		Type:             String,
+		StateFunc:        "state_utils.MemoryConverter()",
+		ValidateDiagFunc: "state_utils.MemoryValidator()",
 	},
 	"disk_size": {
 		Default:          "20000mb",

minikube/generator/schema_builder_test.go

@@ -366,6 +366,8 @@ func TestOverride(t *testing.T) {
 			ForceNew:			true,
 			
 			Default:	"4g",
+			StateFunc:	state_utils.MemoryConverter(),
+			ValidateDiagFunc:	state_utils.MemoryValidator(),
 		},
 	
 	}

minikube/resource_cluster.go

@@ -271,7 +271,7 @@ func initialiseMinikubeClient(d *schema.ResourceData, m interface{}) (lib.Cluste
 	}
 
 	memoryStr := d.Get("memory").(string)
-	memoryMb, err := state_utils.GetMemory(memoryStr);
+	memoryMb, err := state_utils.GetMemory(memoryStr)
 	if err != nil {
 		return nil, err
 	}
@@ -371,16 +371,16 @@ func initialiseMinikubeClient(d *schema.ResourceData, m interface{}) (lib.Cluste
 	vc = lib.ResolveSpecialWaitOptions(vc)
 
 	cc := config.ClusterConfig{
-		Addons:                  addonConfig,
-		APIServerPort:           d.Get("apiserver_port").(int),
-		Name:                    d.Get("cluster_name").(string),
-		KeepContext:             d.Get("keep_context").(bool),
-		EmbedCerts:              d.Get("embed_certs").(bool),
-		MinikubeISO:             state_utils.ReadSliceState(defaultIsos)[0],
-		KicBaseImage:            d.Get("base_image").(string),
-		Network:                 d.Get("network").(string),
-		Memory:                  memoryMb,
-		CPUs:                    func() int {
+		Addons:        addonConfig,
+		APIServerPort: d.Get("apiserver_port").(int),
+		Name:          d.Get("cluster_name").(string),
+		KeepContext:   d.Get("keep_context").(bool),
+		EmbedCerts:    d.Get("embed_certs").(bool),
+		MinikubeISO:   state_utils.ReadSliceState(defaultIsos)[0],
+		KicBaseImage:  d.Get("base_image").(string),
+		Network:       d.Get("network").(string),
+		Memory:        memoryMb,
+		CPUs: func() int {
 			cpus, err := state_utils.GetCPUs(d.Get("cpus").(string))
 			if err != nil {
 				return 2 // Default to 2 CPUs if there's an error

minikube/schema_cluster.go

@@ -137,7 +137,7 @@ var (
 			Optional:			true,
 			ForceNew:			true,
 
-			Default:	"gcr.io/k8s-minikube/kicbase:v0.0.45@sha256:81df288595202a317b1a4dc2506ca2e4ed5f22373c19a441b88cfbf4b9867c85",
+			Default:	"gcr.io/k8s-minikube/kicbase:v0.0.46@sha256:fd2d445ddcc33ebc5c6b68a17e6219ea207ce63c005095ea1525296da2d1a279",
 		},
 
 		"binary_mirror": {
@@ -191,13 +191,13 @@ var (
 		},
 
 		"cpus": {
-			Type:					schema.TypeInt,
+			Type:					schema.TypeString,
 			Description:	"Number of CPUs allocated to Kubernetes. Use \"max\" to use the maximum number of CPUs. Use \"no-limit\" to not specify a limit (Docker/Podman only)",
 
 			Optional:			true,
 			ForceNew:			true,
 
-			Default:	2,
+			Default:	"2",
 		},
 
 		"cri_socket": {
@@ -413,7 +413,7 @@ var (
 
 		"gpus": {
 			Type:					schema.TypeString,
-			Description:	"Allow pods to use your NVIDIA GPUs. Options include: [all,nvidia] (Docker driver with Docker container-runtime only)",
+			Description:	"Allow pods to use your GPUs. Options include: [all,nvidia,amd] (Docker driver with Docker container-runtime only)",
 
 			Optional:			true,
 			ForceNew:			true,
@@ -598,7 +598,7 @@ var (
 
 		"kubernetes_version": {
 			Type:					schema.TypeString,
-			Description:	"The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.31.0, 'latest' for v1.31.0). Defaults to 'stable'.",
+			Description:	"The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.32.0, 'latest' for v1.32.0). Defaults to 'stable'.",
 
 			Optional:			true,
 			ForceNew:			true,
@@ -674,6 +674,8 @@ var (
 			ForceNew:			true,
 
 			Default:	"4g",
+			StateFunc:	state_utils.MemoryConverter(),
+			ValidateDiagFunc:	state_utils.MemoryValidator(),
 		},
 
 		"mount": {