From 84dd19eb23a7b263566a847fe108fc778ecfe6bb Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@microsoft.com>
Date: Fri, 8 Jun 2018 21:10:24 -0700
Subject: [PATCH] Remove an old TODO.

---
 pkg/kubectl/run.go      | 15 ++++++---------
 pkg/kubectl/run_test.go | 38 ++++++++++++++++----------------------
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/pkg/kubectl/run.go b/pkg/kubectl/run.go
index 554996b626e..7fe1f2fe2b4 100644
--- a/pkg/kubectl/run.go
+++ b/pkg/kubectl/run.go
@@ -877,8 +877,6 @@ func (BasicPod) Generate(genericParams map[string]interface{}) (runtime.Object,
 	if len(restartPolicy) == 0 {
 		restartPolicy = v1.RestartPolicyAlways
 	}
-	// TODO: Figure out why we set ImagePullPolicy here, whether we can make it
-	// consistent with the other places imagePullPolicy is set using flag.
 	pod := v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   name,
@@ -888,13 +886,12 @@ func (BasicPod) Generate(genericParams map[string]interface{}) (runtime.Object,
 			ServiceAccountName: params["serviceaccount"],
 			Containers: []v1.Container{
 				{
-					Name:            name,
-					Image:           params["image"],
-					ImagePullPolicy: v1.PullIfNotPresent,
-					Stdin:           stdin,
-					StdinOnce:       !leaveStdinOpen && stdin,
-					TTY:             tty,
-					Resources:       resourceRequirements,
+					Name:      name,
+					Image:     params["image"],
+					Stdin:     stdin,
+					StdinOnce: !leaveStdinOpen && stdin,
+					TTY:       tty,
+					Resources: resourceRequirements,
 				},
 			},
 			DNSPolicy:     v1.DNSClusterFirst,
diff --git a/pkg/kubectl/run_test.go b/pkg/kubectl/run_test.go
index f2f217e486f..b00e591962a 100644
--- a/pkg/kubectl/run_test.go
+++ b/pkg/kubectl/run_test.go
@@ -424,9 +424,8 @@ func TestGeneratePod(t *testing.T) {
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Name:            "foo",
-							Image:           "someimage",
-							ImagePullPolicy: v1.PullIfNotPresent,
+							Name:  "foo",
+							Image: "someimage",
 						},
 					},
 					DNSPolicy:     v1.DNSClusterFirst,
@@ -493,9 +492,8 @@ func TestGeneratePod(t *testing.T) {
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Name:            "foo",
-							Image:           "someimage",
-							ImagePullPolicy: v1.PullIfNotPresent,
+							Name:  "foo",
+							Image: "someimage",
 							Ports: []v1.ContainerPort{
 								{
 									ContainerPort: 80,
@@ -523,9 +521,8 @@ func TestGeneratePod(t *testing.T) {
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Name:            "foo",
-							Image:           "someimage",
-							ImagePullPolicy: v1.PullIfNotPresent,
+							Name:  "foo",
+							Image: "someimage",
 							Ports: []v1.ContainerPort{
 								{
 									ContainerPort: 80,
@@ -563,9 +560,8 @@ func TestGeneratePod(t *testing.T) {
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Name:            "foo",
-							Image:           "someimage",
-							ImagePullPolicy: v1.PullIfNotPresent,
+							Name:  "foo",
+							Image: "someimage",
 						},
 					},
 					DNSPolicy:     v1.DNSClusterFirst,
@@ -589,11 +585,10 @@ func TestGeneratePod(t *testing.T) {
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Name:            "foo",
-							Image:           "someimage",
-							ImagePullPolicy: v1.PullIfNotPresent,
-							Stdin:           true,
-							StdinOnce:       true,
+							Name:      "foo",
+							Image:     "someimage",
+							Stdin:     true,
+							StdinOnce: true,
 						},
 					},
 					DNSPolicy:     v1.DNSClusterFirst,
@@ -618,11 +613,10 @@ func TestGeneratePod(t *testing.T) {
 				Spec: v1.PodSpec{
 					Containers: []v1.Container{
 						{
-							Name:            "foo",
-							Image:           "someimage",
-							ImagePullPolicy: v1.PullIfNotPresent,
-							Stdin:           true,
-							StdinOnce:       false,
+							Name:      "foo",
+							Image:     "someimage",
+							Stdin:     true,
+							StdinOnce: false,
 						},
 					},
 					DNSPolicy:     v1.DNSClusterFirst,