github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove an old TODO.

pull/8/head
Brendan Burns 2018-06-08 21:10:24 -07:00
parent a7a081b541
commit 84dd19eb23
2 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubectl/run.go
View File

@ -877,8 +877,6 @@ func (BasicPod) Generate(genericParams map[string]interface{}) (runtime.Object,
if len(restartPolicy) == 0 { if len(restartPolicy) == 0 {
restartPolicy = v1.RestartPolicyAlways 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{ pod := v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: name, Name: name,
@ -888,13 +886,12 @@ func (BasicPod) Generate(genericParams map[string]interface{}) (runtime.Object,
ServiceAccountName: params["serviceaccount"], ServiceAccountName: params["serviceaccount"],
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: name, Name: name,
Image: params["image"], Image: params["image"],
ImagePullPolicy: v1.PullIfNotPresent, Stdin: stdin,
Stdin: stdin, StdinOnce: !leaveStdinOpen && stdin,
StdinOnce: !leaveStdinOpen && stdin, TTY: tty,
TTY: tty, Resources: resourceRequirements,
Resources: resourceRequirements,
}, },
}, },
DNSPolicy: v1.DNSClusterFirst, DNSPolicy: v1.DNSClusterFirst,

38
pkg/kubectl/run_test.go
View File

@ -424,9 +424,8 @@ func TestGeneratePod(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "foo", Name: "foo",
Image: "someimage", Image: "someimage",
ImagePullPolicy: v1.PullIfNotPresent,
}, },
}, },
DNSPolicy: v1.DNSClusterFirst, DNSPolicy: v1.DNSClusterFirst,
@ -493,9 +492,8 @@ func TestGeneratePod(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "foo", Name: "foo",
Image: "someimage", Image: "someimage",
ImagePullPolicy: v1.PullIfNotPresent,
Ports: []v1.ContainerPort{ Ports: []v1.ContainerPort{
{ {
ContainerPort: 80, ContainerPort: 80,
@ -523,9 +521,8 @@ func TestGeneratePod(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "foo", Name: "foo",
Image: "someimage", Image: "someimage",
ImagePullPolicy: v1.PullIfNotPresent,
Ports: []v1.ContainerPort{ Ports: []v1.ContainerPort{
{ {
ContainerPort: 80, ContainerPort: 80,
@ -563,9 +560,8 @@ func TestGeneratePod(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "foo", Name: "foo",
Image: "someimage", Image: "someimage",
ImagePullPolicy: v1.PullIfNotPresent,
}, },
}, },
DNSPolicy: v1.DNSClusterFirst, DNSPolicy: v1.DNSClusterFirst,
@ -589,11 +585,10 @@ func TestGeneratePod(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "foo", Name: "foo",
Image: "someimage", Image: "someimage",
ImagePullPolicy: v1.PullIfNotPresent, Stdin: true,
Stdin: true, StdinOnce: true,
StdinOnce: true,
}, },
}, },
DNSPolicy: v1.DNSClusterFirst, DNSPolicy: v1.DNSClusterFirst,
@ -618,11 +613,10 @@ func TestGeneratePod(t *testing.T) {
Spec: v1.PodSpec{ Spec: v1.PodSpec{
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "foo", Name: "foo",
Image: "someimage", Image: "someimage",
ImagePullPolicy: v1.PullIfNotPresent, Stdin: true,
Stdin: true, StdinOnce: false,
StdinOnce: false,
}, },
}, },
DNSPolicy: v1.DNSClusterFirst, DNSPolicy: v1.DNSClusterFirst,