Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use k8s.gcr.io/pause instead of kubernetes/pause #69631

Merged
merged 1 commit into from
Oct 12, 2018
Merged

use k8s.gcr.io/pause instead of kubernetes/pause #69631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/e2e/scheduling/taints_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func createPodForTaintsTest(hasToleration bool, tolerationSeconds int, podName,
Containers: []v1.Container{
{
Name: "pause",
Image: "kubernetes/pause",
Image: "k8s.gcr.io/pause:3.1",
},
},
},
Expand All @@ -80,7 +80,7 @@ func createPodForTaintsTest(hasToleration bool, tolerationSeconds int, podName,
Containers: []v1.Container{
{
Name: "pause",
Image: "kubernetes/pause",
Image: "k8s.gcr.io/pause:3.1",
},
},
Tolerations: []v1.Toleration{{Key: "kubernetes.io/e2e-evict-taint-key", Value: "evictTaintVal", Effect: v1.TaintEffectNoExecute}},
Expand All @@ -99,7 +99,7 @@ func createPodForTaintsTest(hasToleration bool, tolerationSeconds int, podName,
Containers: []v1.Container{
{
Name: "pause",
Image: "kubernetes/pause",
Image: "k8s.gcr.io/pause:3.1",
},
},
// default - tolerate forever
Expand Down
4 changes: 2 additions & 2 deletions test/utils/runners.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ func MakePodSpec() v1.PodSpec {
return v1.PodSpec{
Containers: []v1.Container{{
Name: "pause",
Image: "kubernetes/pause",
Image: "k8s.gcr.io/pause:3.1",
Ports: []v1.ContainerPort{{ContainerPort: 80}},
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
Expand Down Expand Up @@ -1254,7 +1254,7 @@ type DaemonConfig struct {

func (config *DaemonConfig) Run() error {
if config.Image == "" {
config.Image = "kubernetes/pause"
config.Image = "k8s.gcr.io/pause:3.1"
}
nameLabel := map[string]string{
"name": config.Name + "-daemon",
Expand Down