Merge pull request #55826 from madhanrm/portmap

Automatic merge from submit-queue (batch tested with PRs 55697, 55631, 51905, 55647, 55826). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. GetPodPortMappings should return nil error if checkpoint returns with KeyNotFound error **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #55819 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #55826 from madhanrm/portmap
47a2718d · Kubernetes Submit Queue · GitHub · cc624458 · 84d87b70 · 47a2718d
Unverified Commit 47a2718d authored Nov 16, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

docker_service.go pkg/kubelet/dockershim/docker_service.go +4 -0

No files found.
--- a/pkg/kubelet/dockershim/docker_service.go
+++ b/pkg/kubelet/dockershim/docker_service.go
@@ -44,6 +44,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/network/kubenet"
 	"k8s.io/kubernetes/pkg/kubelet/server/streaming"
 	"k8s.io/kubernetes/pkg/kubelet/util/cache"
+	utilstore "k8s.io/kubernetes/pkg/kubelet/util/store"

 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/metrics"
@@ -365,6 +366,9 @@ func (ds *dockerService) GetPodPortMappings(podSandboxID string) ([]*hostport.Po
 	checkpoint, err := ds.checkpointHandler.GetCheckpoint(podSandboxID)
 	// Return empty portMappings if checkpoint is not found
 	if err != nil {
+		if err == utilstore.ErrKeyNotFound {
+			return nil, nil
+		}
 		return nil, err
 	}