Skip to content

Commit da9be10

Browse files
Tom Morellyscott-the-programmer
authored andcommitted
fix(apiservernames): use apiservernnames field
1 parent 56e7277 commit da9be10

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

minikube/resource_cluster.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,18 @@ func initialiseMinikubeClient(d *schema.ResourceData, m interface{}) (service.Cl
271271
return nil, err
272272
}
273273

274+
apiserverNames := []string{}
275+
if d.Get("apiserver_names").(*schema.Set).Len() > 0 {
276+
apiserverNames = state_utils.ReadSliceState(d.Get("apiserver_names"))
277+
}
278+
274279
k8sVersion := clusterClient.GetK8sVersion()
275280
kubernetesConfig := config.KubernetesConfig{
276281
KubernetesVersion: k8sVersion,
277282
ClusterName: d.Get("cluster_name").(string),
278283
Namespace: d.Get("namespace").(string),
279284
APIServerName: d.Get("apiserver_name").(string),
280-
APIServerNames: []string{d.Get("apiserver_name").(string)},
285+
APIServerNames: apiserverNames,
281286
DNSDomain: d.Get("dns_domain").(string),
282287
FeatureGates: d.Get("feature_gates").(string),
283288
ContainerRuntime: d.Get("container_runtime").(string),

minikube/resource_cluster_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,15 @@ func getBaseMockClient(ctrl *gomock.Controller, clusterName string) *service.Moc
258258
clusterSchema := ResourceCluster().Schema
259259
mountString, _ := clusterSchema["mount_string"].DefaultFunc()
260260

261+
262+
261263
k8sVersion := "v1.26.3"
262264
kubernetesConfig := config.KubernetesConfig{
263265
KubernetesVersion: k8sVersion,
264266
ClusterName: clusterName,
265267
Namespace: clusterSchema["namespace"].Default.(string),
266268
APIServerName: clusterSchema["apiserver_name"].Default.(string),
267-
APIServerNames: []string{clusterSchema["apiserver_name"].Default.(string)},
269+
APIServerNames: []string{"minikubeCA"},
268270
DNSDomain: clusterSchema["dns_domain"].Default.(string),
269271
FeatureGates: clusterSchema["feature_gates"].Default.(string),
270272
ContainerRuntime: clusterSchema["container_runtime"].Default.(string),

minikube/schema_cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ var (
9898

9999
Optional: true,
100100
ForceNew: true,
101-
101+
102102
Elem: &schema.Schema{
103103
Type: schema.TypeString,
104104
},

0 commit comments

Comments
 (0)