Skip to content

K
k3s
Commit 84dd19eb authored by Brendan Burns's avatar Brendan Burns
Browse files
Options

Remove an old TODO.

parent a7a081b5
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 31 deletions
pkg/kubectl/run.go
View file @ 84dd19eb
......@@ -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,
......
pkg/kubectl/run_test.go
View file @ 84dd19eb
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment