github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23325 from MurgaNikolay/master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-22 11:47:38 -07:00
commit 8f71655bcc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet.go
View File

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