1
0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-25 20:59:28 +01:00

Merge pull request #1274 from ingvagabund/cherry-pick-pause-image

[1.26] update pause image from 'kubernetes/pause' to 'registry.k8s.io/pause'
This commit is contained in:
Kubernetes Prow Robot
2023-10-23 14:07:47 +02:00
committed by GitHub
5 changed files with 8 additions and 8 deletions

View File

@@ -86,7 +86,7 @@ func TestRemoveDuplicates(t *testing.T) {
Containers: []v1.Container{{
Name: "pause",
ImagePullPolicy: "Always",
Image: "kubernetes/pause",
Image: "registry.k8s.io/pause",
Ports: []v1.ContainerPort{{ContainerPort: 80}},
SecurityContext: &v1.SecurityContext{
AllowPrivilegeEscalation: utilpointer.Bool(false),

View File

@@ -176,7 +176,7 @@ func createDeployment(ctx context.Context, clientSet clientset.Interface, namesp
Containers: []v1.Container{{
Name: "pause",
ImagePullPolicy: "Always",
Image: "kubernetes/pause",
Image: "registry.k8s.io/pause",
Ports: []v1.ContainerPort{{ContainerPort: 80}},
SecurityContext: &v1.SecurityContext{
AllowPrivilegeEscalation: utilpointer.Bool(false),

View File

@@ -69,7 +69,7 @@ func MakePodSpec(priorityClassName string, gracePeriod *int64) v1.PodSpec {
Containers: []v1.Container{{
Name: "pause",
ImagePullPolicy: "Never",
Image: "kubernetes/pause",
Image: "registry.k8s.io/pause",
Ports: []v1.ContainerPort{{ContainerPort: 80}},
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
@@ -330,7 +330,7 @@ func TestLowNodeUtilization(t *testing.T) {
Containers: []v1.Container{{
Name: "pause",
ImagePullPolicy: "Never",
Image: "kubernetes/pause",
Image: "registry.k8s.io/pause",
Ports: []v1.ContainerPort{{ContainerPort: 80}},
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
@@ -1335,7 +1335,7 @@ func createBalancedPodForNodes(
Containers: []v1.Container{
{
Name: "pause",
Image: "kubernetes/pause",
Image: "registry.k8s.io/pause",
Resources: v1.ResourceRequirements{
Limits: needCreateResource,
Requests: needCreateResource,

View File

@@ -87,7 +87,7 @@ func TestTooManyRestarts(t *testing.T) {
Containers: []v1.Container{{
Name: "pause",
ImagePullPolicy: "Always",
Image: "kubernetes/pause",
Image: "registry.k8s.io/pause",
Command: []string{"/bin/sh"},
Args: []string{"-c", "sleep 1s && exit 1"},
Ports: []v1.ContainerPort{{ContainerPort: 80}},

View File

@@ -33,8 +33,8 @@ if [ -n "$KIND_E2E" ]; then
export PATH=$PATH:$PWD
kind create cluster --image kindest/node:${K8S_VERSION} --config=./hack/kind_config.yaml
fi
${CONTAINER_ENGINE:-docker} pull kubernetes/pause
kind load docker-image kubernetes/pause
${CONTAINER_ENGINE:-docker} pull registry.k8s.io/pause
kind load docker-image registry.k8s.io/pause
kind get kubeconfig > /tmp/admin.conf
export KUBECONFIG="/tmp/admin.conf"
mkdir -p ~/gopath/src/sigs.k8s.io/