Merge pull request #1244 from HotelsDotCom/bug/propagate-kubenetwork-settings-to-nodes

mumoshu · web-flow · commit acab53aa54cb · 2018-04-17T10:43:26.000+09:00
Inherit controlplane Kubenetes-Newtworking config in node pools.
diff --git a/core/nodepool/config/deployment.go b/core/nodepool/config/deployment.go
@@ -131,5 +131,8 @@ func (c DeploymentSettings) WithDefaultsFrom(main cfg.DeploymentSettings) Deploy
 	//Inherit main KubeDns config
 	c.KubeDns.MergeIfEmpty(main.KubeDns)
 
+	//Inherit main Kubernetes config (e.g. for Kubernetes.Networking.SelfHosting etc.)
+	c.Kubernetes = main.Kubernetes
+
 	return c
 }

Original file line number	Diff line number	Diff line change
`@@ -131,5 +131,8 @@ func (c DeploymentSettings) WithDefaultsFrom(main cfg.DeploymentSettings) Deploy`
`131`	`131`	`//Inherit main KubeDns config`
`132`	`132`	`c.KubeDns.MergeIfEmpty(main.KubeDns)`
`133`	`133`
	`134`	`+ //Inherit main Kubernetes config (e.g. for Kubernetes.Networking.SelfHosting etc.)`
	`135`	`+ c.Kubernetes = main.Kubernetes`
	`136`	`+`
`134`	`137`	`return c`
`135`	`138`	`}`