Skip to content

Commit c7703c3

Browse files
add error handling for CPU retrieval in Minikube client initialization
1 parent 0643c6a commit c7703c3

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

hack/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func main() {
5151
Name: "terraform-provider-minikube-acc",
5252
KeepContext: schema["keep_context"].Default.(bool),
5353
EmbedCerts: schema["embed_certs"].Default.(bool),
54-
MinikubeISO: "https://github.com/kubernetes/minikube/releases/download/v1.33.0/minikube-v1.33.0-amd64.iso",
54+
MinikubeISO: "https://github.com/kubernetes/minikube/releases/download/v1.34.0/minikube-v1.34.0-amd64.iso",
5555
KicBaseImage: schema["base_image"].Default.(string),
5656
Network: schema["network"].Default.(string),
5757
Memory: 6000,
@@ -114,7 +114,7 @@ func main() {
114114
ClusterConfig: &cc,
115115
ClusterName: "terraform-provider-minikube-acc",
116116
Addons: []string{},
117-
IsoUrls: []string{"https://github.com/kubernetes/minikube/releases/download/v1.33.0/minikube-v1.33.0-amd64.iso"},
117+
IsoUrls: []string{"https://github.com/kubernetes/minikube/releases/download/v1.34.0/minikube-v1.34.0-amd64.iso"},
118118
NativeSsh: true,
119119
DeleteOnFailure: true,
120120
HA: true,

minikube/resource_cluster.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,13 @@ func initialiseMinikubeClient(d *schema.ResourceData, m interface{}) (lib.Cluste
271271
}
272272

273273
memoryStr := d.Get("memory").(string)
274-
memoryMb, err := state_utils.GetMemory(memoryStr);
274+
memoryMb, err := state_utils.GetMemory(memoryStr)
275+
if err != nil {
276+
return nil, err
277+
}
278+
279+
cpuStr := d.Get("cpus").(string)
280+
cpu, err := state_utils.GetCPU(cpuStr)
275281
if err != nil {
276282
return nil, err
277283
}
@@ -380,7 +386,7 @@ func initialiseMinikubeClient(d *schema.ResourceData, m interface{}) (lib.Cluste
380386
KicBaseImage: d.Get("base_image").(string),
381387
Network: d.Get("network").(string),
382388
Memory: memoryMb,
383-
CPUs: d.Get("cpus").(int),
389+
CPUs: cpu,
384390
DiskSize: diskMb,
385391
Driver: driver,
386392
ListenAddress: d.Get("listen_address").(string),

0 commit comments

Comments
 (0)