Merge pull request #107 from moelsayed/fix_service_defaults_bug

Fix bug in setting service defaults
rancher · Dec 5, 2017 · 43d3342 · 43d3342
2 parents 28d961d + 5bcf084
commit 43d3342
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -130,17 +130,17 @@ func (c *Cluster) setClusterDefaults() {
 }
 
 func (c *Cluster) setClusterServicesDefaults() {
-	serviceConfigDefaultsMap := map[string]string{
-		c.Services.KubeAPI.ServiceClusterIPRange:        DefaultServiceClusterIPRange,
-		c.Services.KubeController.ServiceClusterIPRange: DefaultServiceClusterIPRange,
-		c.Services.KubeController.ClusterCIDR:           DefaultClusterCIDR,
-		c.Services.Kubelet.ClusterDNSServer:             DefaultClusterDNSService,
-		c.Services.Kubelet.ClusterDomain:                DefaultClusterDomain,
-		c.Services.Kubelet.InfraContainerImage:          DefaultInfraContainerImage,
-		c.Authentication.Strategy:                       DefaultAuthStrategy,
+	serviceConfigDefaultsMap := map[*string]string{
+		&c.Services.KubeAPI.ServiceClusterIPRange:        DefaultServiceClusterIPRange,
+		&c.Services.KubeController.ServiceClusterIPRange: DefaultServiceClusterIPRange,
+		&c.Services.KubeController.ClusterCIDR:           DefaultClusterCIDR,
+		&c.Services.Kubelet.ClusterDNSServer:             DefaultClusterDNSService,
+		&c.Services.Kubelet.ClusterDomain:                DefaultClusterDomain,
+		&c.Services.Kubelet.InfraContainerImage:          DefaultInfraContainerImage,
+		&c.Authentication.Strategy:                       DefaultAuthStrategy,
 	}
 	for k, v := range serviceConfigDefaultsMap {
-		setDefaultIfEmpty(&k, v)
+		setDefaultIfEmpty(k, v)
 	}
 }