github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125112 from neolit123/1.31-add-v-to-windows-pause-after-promo

Browse Source 
dependencies: start using registry.k8s.io/pause:3.10
This commit is contained in:
Kubernetes Prow Robot
2024-05-24 03:55:56 -07:00
committed by GitHub
parent 3332eef27d 5e290ebc90
commit e0e6c9633d
59 changed files with 85 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
build/dependencies.yaml
View File

@@ -189,17 +189,14 @@ dependencies:
- path: build/common.sh
match: __default_go_runner_version=
# TODO: enable once pause 3.10 is promoted
# https://github.com/kubernetes/kubernetes/issues/125092
#
# - name: "registry.k8s.io/pause"
# version: 3.10
# refPaths:
# - path: build/pause/Makefile
# match: TAG\s*\?=
- name: "registry.k8s.io/pause"
version: 3.10
refPaths:
- path: build/pause/Makefile
match: TAG\s*\?=
- name: "registry.k8s.io/pause: dependents"
version: 3.9
version: 3.10
refPaths:
- path: cluster/gce/config-common.sh
match: registry.k8s.io\/pause:\d+\.\d+
@@ -209,12 +206,6 @@ dependencies:
match: registry.k8s.io\/pause:\d+\.\d+
- path: cmd/kubeadm/app/constants/constants.go
match: PauseVersion\s+=
- path: cmd/kubeadm/app/util/template_test.go
match: validTmpl\s+=
- path: cmd/kubeadm/app/util/template_test.go
match: validTmplOut\s+=
- path: cmd/kubeadm/app/util/template_test.go
match: doNothing\s+=
- path: cmd/kubelet/app/options/container_runtime.go
match: defaultPodSandboxImageVersion\s+=
- path: hack/testdata/pod-with-precision.json
@@ -249,8 +240,6 @@ dependencies:
match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml
match: registry.k8s.io\/pause:\d+\.\d+
- path: test/utils/runners.go
match: registry.k8s.io\/pause:\d+\.\d+
- path: test/utils/image/manifest.go
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}

2
cluster/gce/config-common.sh
View File

@@ -154,7 +154,7 @@ export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfi
# Path for kube-proxy kubeconfig file on Windows nodes.
export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig"
# Pause container image for Windows container.
export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.9"
export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.10"
# Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows.
export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
# Version for csi-proxy

2
cluster/gce/gci/configure-helper.sh
View File

@@ -3279,7 +3279,7 @@ oom_score = -999
[plugins."io.containerd.grpc.v1.cri"]
stream_server_address = "127.0.0.1"
max_container_log_line_size = ${CONTAINERD_MAX_CONTAINER_LOG_LINE:-262144}
sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.9"}"
sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.10"}"
[plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "${KUBE_HOME}/bin"
conf_dir = "/etc/cni/net.d"

2
cluster/gce/windows/smoke-test.sh
View File

@@ -341,7 +341,7 @@ spec:
spec:
containers:
- name: pause-win
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
nodeSelector:
kubernetes.io/os: windows
tolerations:

2
cmd/kubeadm/app/constants/constants.go
View File

@@ -435,7 +435,7 @@ const (
ModeNode string = "Node"
// PauseVersion indicates the default pause image version for kubeadm
PauseVersion = "3.9"
PauseVersion = "3.10"
// CgroupDriverSystemd holds the systemd driver type
CgroupDriverSystemd = "systemd"

4
cmd/kubeadm/app/phases/kubelet/flags_test.go
View File

@@ -79,11 +79,11 @@ func TestBuildKubeletArgs(t *testing.T) {
nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
CRISocket: "unix:///var/run/containerd/containerd.sock",
},
pauseImage: "registry.k8s.io/pause:3.9",
pauseImage: "registry.k8s.io/pause:ver",
},
expected: []kubeadmapi.Arg{
{Name: "container-runtime-endpoint", Value: "unix:///var/run/containerd/containerd.sock"},
{Name: "pod-infra-container-image", Value: "registry.k8s.io/pause:3.9"},
{Name: "pod-infra-container-image", Value: "registry.k8s.io/pause:ver"},
},
},
}

8
cmd/kubeadm/app/util/runtime/runtime_test.go
View File

@@ -164,8 +164,8 @@ func TestListKubeContainers(t *testing.T) {
func TestSandboxImage(t *testing.T) {
fcmd := fakeexec.FakeCmd{
CombinedOutputScript: []fakeexec.FakeAction{
func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:3.9"), nil, nil },
func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:3.9\n"), nil, nil },
func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:ver"), nil, nil },
func() ([]byte, []byte, error) { return []byte("registry.k8s.io/pause:ver\n"), nil, nil },
func() ([]byte, []byte, error) { return nil, nil, nil },
func() ([]byte, []byte, error) { return nil, nil, &fakeexec.FakeExitError{Status: 1} },
},
@@ -181,8 +181,8 @@ func TestSandboxImage(t *testing.T) {
expected string
isError bool
}{
{"valid: read sandbox image normally", "registry.k8s.io/pause:3.9", false},
{"valid: read sandbox image with leading/trailing white spaces", "registry.k8s.io/pause:3.9", false},
{"valid: read sandbox image normally", "registry.k8s.io/pause:ver", false},
{"valid: read sandbox image with leading/trailing white spaces", "registry.k8s.io/pause:ver", false},
{"invalid: read empty sandbox image", "", true},
{"invalid: failed to read sandbox image", "", true},
}

6
cmd/kubeadm/app/util/template_test.go
View File

@@ -21,9 +21,9 @@ import (
)
const (
validTmpl = "image: {{ .ImageRepository }}/pause:3.9"
validTmplOut = "image: registry.k8s.io/pause:3.9"
doNothing = "image: registry.k8s.io/pause:3.9"
validTmpl = "image: {{ .ImageRepository }}/pause:ver"
validTmplOut = "image: registry.k8s.io/pause:ver"
doNothing = "image: registry.k8s.io/pause:ver"
invalidTmpl1 = "{{ .baz }/d}"
invalidTmpl2 = "{{ !foobar }}"
)

2
cmd/kubelet/app/options/container_runtime.go
View File

@@ -23,7 +23,7 @@ import (
const (
// When these values are updated, also update test/utils/image/manifest.go
defaultPodSandboxImageName = "registry.k8s.io/pause"
defaultPodSandboxImageVersion = "3.9"
defaultPodSandboxImageVersion = "3.10"
)
var (

2
hack/testdata/filter/pod-apply-selector.yaml vendored
View File

@@ -8,4 +8,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

2
hack/testdata/filter/pod-dont-apply.yaml vendored
View File

@@ -8,4 +8,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

2
hack/testdata/multi-resource-1.yaml vendored
View File

@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
---
apiVersion: v1
kind: Namespace

6
hack/testdata/multi-resource-3.yaml vendored
View File

@@ -8,7 +8,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
---
apiVersion: v1
kind: Pod
@@ -17,7 +17,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
---
apiVersion: v1
kind: Pod
@@ -26,5 +26,5 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

2
hack/testdata/multi-resource-json-modify.json vendored
View File

@@ -43,7 +43,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "registry.k8s.io/pause:3.9",
"image": "registry.k8s.io/pause:3.10",
"ports":[{
"containerPort":9949,
"protocol":"TCP"

2
hack/testdata/multi-resource-json.json vendored
View File

@@ -41,7 +41,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "registry.k8s.io/pause:3.9",
"image": "registry.k8s.io/pause:3.10",
"ports":[{
"containerPort":9949,
"protocol":"TCP"

2
hack/testdata/multi-resource-list-modify.json vendored
View File

@@ -47,7 +47,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "registry.k8s.io/pause:3.9",
"image": "registry.k8s.io/pause:3.10",
"ports":[{
"containerPort":9949,
"protocol":"TCP"

2
hack/testdata/multi-resource-list.json vendored
View File

@@ -45,7 +45,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "registry.k8s.io/pause:3.9",
"image": "registry.k8s.io/pause:3.10",
"ports":[{
"containerPort":9949,
"protocol":"TCP"

4
hack/testdata/multi-resource-rclist-modify.json vendored
View File

@@ -26,7 +26,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "registry.k8s.io/pause:3.9",
"image": "registry.k8s.io/pause:3.10",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
@@ -60,7 +60,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "registry.k8s.io/pause:3.9",
"image": "registry.k8s.io/pause:3.10",
"ports":[{
"containerPort":9949,
"protocol":"TCP"

4
hack/testdata/multi-resource-rclist.json vendored
View File

@@ -26,7 +26,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "registry.k8s.io/pause:3.9",
"image": "registry.k8s.io/pause:3.10",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
@@ -60,7 +60,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "registry.k8s.io/pause:3.9",
"image": "registry.k8s.io/pause:3.10",
"ports":[{
"containerPort":9949,
"protocol":"TCP"

2
hack/testdata/multi-resource-yaml-modify.yaml vendored
View File

@@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
ports:
- containerPort: 9949
protocol: TCP

2
hack/testdata/multi-resource-yaml.yaml vendored
View File

@@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
ports:
- containerPort: 9949
protocol: TCP

2
hack/testdata/pod-apply.yaml vendored
View File

@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

2
hack/testdata/pod-with-precision.json vendored
View File

@@ -9,7 +9,7 @@
"containers": [
{
"name": "kubernetes-pause",
"image": "registry.k8s.io/pause:3.9"
"image": "registry.k8s.io/pause:3.10"
}
],
"restartPolicy": "Never",

2
hack/testdata/pod.yaml vendored
View File

@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

2
hack/testdata/prune/a.yaml vendored
View File

@@ -7,4 +7,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

4
hack/testdata/sorted-pods/sorted-pod1.yaml vendored
View File

@@ -8,8 +8,8 @@ metadata:
spec:
containers:
- name: kubernetes-pause2
image: registry.k8s.io/pause:3.9
resources:
image: registry.k8s.io/pause:3.10
resources:
requests:
memory: "64Mi"
cpu: "250m"

4
hack/testdata/sorted-pods/sorted-pod2.yaml vendored
View File

@@ -8,8 +8,8 @@ metadata:
spec:
containers:
- name: kubernetes-pause1
image: registry.k8s.io/pause:3.9
resources:
image: registry.k8s.io/pause:3.10
resources:
requests:
memory: "1G"
cpu: "0.5"

2
hack/testdata/sorted-pods/sorted-pod3.yaml vendored
View File

@@ -8,4 +8,4 @@ metadata:
spec:
containers:
- name: kubernetes-pause3
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

4
staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml vendored
View File

@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
---
apiVersion: v1
kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

2
staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml vendored
View File

@@ -14,4 +14,4 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

4
test/cmd/core.sh
View File

@@ -537,9 +537,9 @@ run_pod_tests() {
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'changed-with-yaml:'
## Patch pod from JSON can change image
# Command
kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "registry.k8s.io/pause:3.9"}]}}'
kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "registry.k8s.io/pause:3.10"}]}}'
# Post-condition: valid-pod POD has expected image
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.9:'
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.10:'
# pod has field for kubectl patch field manager
output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1)

10
test/cmd/diff.sh
View File

@@ -128,7 +128,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
---
apiVersion: v1
kind: Pod
@@ -140,7 +140,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
---
apiVersion: v1
kind: Pod
@@ -152,7 +152,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
EOF
kube::test::get_object_assert 'pods a -n nsbprune' "{{${id_field:?}}}" 'a'
kube::test::get_object_assert 'pods b -n nsbprune' "{{${id_field:?}}}" 'b'
@@ -169,7 +169,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
---
apiVersion: v1
kind: Pod
@@ -181,7 +181,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
EOF
)
output_message=$(echo "${PRUNE}" | kubectl diff -l prune-group=true -f -)

2
test/e2e/testing-manifests/scheduling/nvidia-driver-installer.yaml
View File

@@ -81,6 +81,6 @@ spec:
- name: root-mount
mountPath: /root
containers:
- image: "registry.k8s.io/pause:3.9"
- image: "registry.k8s.io/pause:3.10"
name: pause

4
test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml vendored
View File

@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10
---
apiVersion: v1
kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

2
test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml vendored
View File

@@ -14,4 +14,4 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.9
image: registry.k8s.io/pause:3.10

2
test/integration/benchmark-controller.json
View File

@@ -17,7 +17,7 @@
"spec": {
"containers": [{
"name": "test-container",
"image": "registry.k8s.io/pause:3.9"
"image": "registry.k8s.io/pause:3.10"
}]
}
}

2
test/integration/scheduler_perf/config/churn/pod-default.yaml
View File

@@ -4,5 +4,5 @@ metadata:
generateName: pod-churn-
spec:
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause

2
test/integration/scheduler_perf/config/dra/pod-with-claim-template.yaml
View File

@@ -4,7 +4,7 @@ metadata:
generateName: test-dra
spec:
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
resources:
claims:

2
test/integration/scheduler_perf/config/dra/pod-with-many-claim-templates.yaml
View File

@@ -4,7 +4,7 @@ metadata:
generateName: test-dra
spec:
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
resources:
claims:

2
test/integration/scheduler_perf/config/pod-affinity-ns-selector.yaml
View File

@@ -16,7 +16,7 @@ spec:
matchLabels:
team: devops
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-anti-affinity-ns-selector.yaml
View File

@@ -16,7 +16,7 @@ spec:
matchLabels:
team: devops
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-default.yaml
View File

@@ -4,7 +4,7 @@ metadata:
generateName: pod-
spec:
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-high-priority-large-cpu.yaml
View File

@@ -5,7 +5,7 @@ metadata:
spec:
priority: 10
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-high-priority.yaml
View File

@@ -5,7 +5,7 @@ metadata:
spec:
priority: 10
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-large-cpu.yaml
View File

@@ -4,7 +4,7 @@ metadata:
generateName: pod-
spec:
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-low-priority.yaml
View File

@@ -5,7 +5,7 @@ metadata:
spec:
terminationGracePeriodSeconds: 0
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-preferred-affinity-ns-selector.yaml
View File

@@ -18,7 +18,7 @@ spec:
team: devops
weight: 1
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-preferred-anti-affinity-ns-selector.yaml
View File

@@ -18,7 +18,7 @@ spec:
team: devops
weight: 1
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-node-affinity.yaml
View File

@@ -14,7 +14,7 @@ spec:
- zone1
- zone2
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-node-inclusion-policy.yaml
View File

@@ -6,7 +6,7 @@ metadata:
foo: bar
spec:
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml
View File

@@ -14,7 +14,7 @@ spec:
topologyKey: topology.kubernetes.io/zone
namespaces: ["sched-1", "sched-0"]
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml
View File

@@ -14,7 +14,7 @@ spec:
topologyKey: kubernetes.io/hostname
namespaces: ["sched-1", "sched-0"]
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml
View File

@@ -16,7 +16,7 @@ spec:
namespaces: ["sched-1", "sched-0"]
weight: 1
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml
View File

@@ -16,7 +16,7 @@ spec:
namespaces: ["sched-1", "sched-0"]
weight: 1
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml
View File

@@ -13,7 +13,7 @@ spec:
matchLabels:
color: blue
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-secret-volume.yaml
View File

@@ -4,7 +4,7 @@ metadata:
generateName: secret-volume-
spec:
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml
View File

@@ -13,7 +13,7 @@ spec:
matchLabels:
color: blue
containers:
- image: registry.k8s.io/pause:3.9
- image: registry.k8s.io/pause:3.10
name: pause
ports:
- containerPort: 80

2
test/utils/image/manifest.go
View File

@@ -253,7 +253,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
configs[Nonewprivs] = Config{list.PromoterE2eRegistry, "nonewprivs", "1.3"}
configs[NonRoot] = Config{list.PromoterE2eRegistry, "nonroot", "1.4"}
// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
configs[Pause] = Config{list.GcRegistry, "pause", "3.9"}
configs[Pause] = Config{list.GcRegistry, "pause", "3.10"}
configs[Perl] = Config{list.PromoterE2eRegistry, "perl", "5.26"}
configs[PrometheusDummyExporter] = Config{list.GcRegistry, "prometheus-dummy-exporter", "v0.1.0"}
configs[PrometheusToSd] = Config{list.GcRegistry, "prometheus-to-sd", "v0.5.0"}

5
test/utils/runners.go
View File

@@ -46,6 +46,7 @@ import (
"k8s.io/client-go/util/workqueue"
api "k8s.io/kubernetes/pkg/apis/core"
extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions"
imageutils "k8s.io/kubernetes/test/utils/image"
"k8s.io/utils/pointer"
"k8s.io/klog/v2"
@@ -1211,7 +1212,7 @@ func MakePodSpec() v1.PodSpec {
return v1.PodSpec{
Containers: []v1.Container{{
Name: "pause",
Image: "registry.k8s.io/pause:3.9",
Image: imageutils.GetE2EImage(imageutils.Pause),
Ports: []v1.ContainerPort{{ContainerPort: 80}},
Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{
@@ -1478,7 +1479,7 @@ type DaemonConfig struct {
func (config *DaemonConfig) Run(ctx context.Context) error {
if config.Image == "" {
config.Image = "registry.k8s.io/pause:3.9"
config.Image = imageutils.GetE2EImage(imageutils.Pause)
}
nameLabel := map[string]string{
"name": config.Name + "-daemon",