Merge pull request #23325 from MurgaNikolay/master

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-22 11:47:38 -07:00

View File

@@ -405,7 +405,7 @@ func NewMainKubelet(
imageBackOff,
serializeImagePulls,
enableCustomMetrics,
hairpinMode == componentconfig.HairpinVeth,
klet.hairpinMode == componentconfig.HairpinVeth,
containerRuntimeOptions...,
)
case "rkt":