rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-26 07:25:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #107 from moelsayed/fix_service_defaults_bug

Browse Source 
Fix bug in setting service defaults
This commit is contained in:
Hussein Galal
2017-12-05 21:50:47 +02:00
committed by GitHub
parent 28d961d83e 5bcf0845c7
commit 43d334253b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cluster/cluster.go
View File

@@ -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)
}
}