From 3d530f7f3750994f4bb227d155d47dd86d8b5859 Mon Sep 17 00:00:00 2001 From: tobad357 Date: Wed, 16 Mar 2016 21:36:41 +0800 Subject: [PATCH] Fix for issue #22932 infinite pod restarts This fixes an issue when using CNI where the hash of a Container object will differ between creation and change checks due to the docker image exporting ports --- pkg/kubelet/dockertools/manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 0c640bd764b..c88b0b6d241 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -807,7 +807,7 @@ func (dm *DockerManager) podInfraContainerChanged(pod *api.Pod, podInfraContaine glog.V(4).Infof("host: %v, %v", pod.Spec.SecurityContext.HostNetwork, networkMode) return true, nil } - } else { + } else if dm.networkPlugin.Name() != "cni" && dm.networkPlugin.Name() != "kubenet" { // Docker only exports ports from the pod infra container. Let's // collect all of the relevant ports and export them. for _, container := range pod.Spec.Containers {