github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Switch to pause 3.7

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2022-03-29 15:36:38 -04:00
parent 61b3c028ba
commit f7ad09c447
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
55 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -150,7 +150,7 @@ dependencies:
match: TAG\s*\?= match: TAG\s*\?=
- name: "k8s.gcr.io/pause: dependents" - name: "k8s.gcr.io/pause: dependents"
version: 3.6 version: 3.7
refPaths: refPaths:
- path: cluster/gce/config-common.sh - path: cluster/gce/config-common.sh
match: k8s.gcr.io\/pause:\d+\.\d+ match: k8s.gcr.io\/pause:\d+\.\d+

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

@ -160,7 +160,7 @@ export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfi
# Path for kube-proxy kubeconfig file on Windows nodes. # Path for kube-proxy kubeconfig file on Windows nodes.
export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig" export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig"
# Pause container image for Windows container. # Pause container image for Windows container.
export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.6" export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.7"
# Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows. # 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" export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
# Version for csi-proxy # Version for csi-proxy

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

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

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

@ -358,7 +358,7 @@ spec:
spec: spec:
containers: containers:
- name: pause-win - name: pause-win
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7
nodeSelector: nodeSelector:
kubernetes.io/os: windows kubernetes.io/os: windows
tolerations: tolerations:

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

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

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

@ -122,11 +122,11 @@ func TestBuildKubeletArgMap(t *testing.T) {
nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
CRISocket: "unix:///var/run/dockershim.sock", CRISocket: "unix:///var/run/dockershim.sock",
}, },
pauseImage: "k8s.gcr.io/pause:3.6", pauseImage: "k8s.gcr.io/pause:3.7",
}, },
expected: map[string]string{ expected: map[string]string{
"network-plugin": "cni", "network-plugin": "cni",
"pod-infra-container-image": "k8s.gcr.io/pause:3.6", "pod-infra-container-image": "k8s.gcr.io/pause:3.7",
}, },
}, },
{ {

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

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

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

@ -24,7 +24,7 @@ import (
const ( const (
// When these values are updated, also update test/utils/image/manifest.go // When these values are updated, also update test/utils/image/manifest.go
defaultPodSandboxImageName = "k8s.gcr.io/pause" defaultPodSandboxImageName = "k8s.gcr.io/pause"
defaultPodSandboxImageVersion = "3.6" defaultPodSandboxImageVersion = "3.7"
) )
var ( var (

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

@ -8,4 +8,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7

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

@ -8,4 +8,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7

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

@ -11,7 +11,7 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7
--- ---
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -29,7 +29,7 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7
ports: ports:
- containerPort: 9949 - containerPort: 9949
protocol: TCP protocol: TCP

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

@ -27,7 +27,7 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7
ports: ports:
- containerPort: 9949 - containerPort: 9949
protocol: TCP protocol: TCP

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

@ -7,4 +7,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7

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

@ -9,7 +9,7 @@
"containers": [ "containers": [
{ {
"name": "kubernetes-pause", "name": "kubernetes-pause",
"image": "k8s.gcr.io/pause:3.6" "image": "k8s.gcr.io/pause:3.7"
} }
], ],
"restartPolicy": "Never", "restartPolicy": "Never",

2
hack/testdata/pod.yaml vendored
View File

@ -7,4 +7,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7

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

@ -7,4 +7,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7

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

@ -8,4 +8,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7

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

@ -8,7 +8,7 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause2 - name: kubernetes-pause2
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7
resources: resources:
requests: requests:
memory: "64Mi" memory: "64Mi"

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

@ -8,7 +8,7 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause1 - name: kubernetes-pause1
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7
resources: resources:
requests: requests:
memory: "1G" memory: "1G"

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

@ -8,4 +8,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause3 - name: kubernetes-pause3
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7

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

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

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

@ -14,4 +14,4 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7

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

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

@ -81,6 +81,6 @@ spec:
- name: root-mount - name: root-mount
mountPath: /root mountPath: /root
containers: containers:
- image: "k8s.gcr.io/pause:3.6" - image: "k8s.gcr.io/pause:3.7"
name: pause name: pause

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

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

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

@ -14,4 +14,4 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: k8s.gcr.io/pause:3.6 image: k8s.gcr.io/pause:3.7

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

@ -17,7 +17,7 @@
"spec": { "spec": {
"containers": [{ "containers": [{
"name": "test-container", "name": "test-container",
"image": "k8s.gcr.io/pause:3.6" "image": "k8s.gcr.io/pause:3.7"
}] }]
} }
} }

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

@ -4,5 +4,5 @@ metadata:
generateName: pod-churn- generateName: pod-churn-
spec: spec:
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause

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

@ -16,7 +16,7 @@ spec:
matchLabels: matchLabels:
team: devops team: devops
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -16,7 +16,7 @@ spec:
matchLabels: matchLabels:
team: devops team: devops
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -4,7 +4,7 @@ metadata:
generateName: pod- generateName: pod-
spec: spec:
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -5,7 +5,7 @@ metadata:
spec: spec:
priority: 10 priority: 10
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -5,7 +5,7 @@ metadata:
spec: spec:
priority: 10 priority: 10
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -4,7 +4,7 @@ metadata:
generateName: pod- generateName: pod-
spec: spec:
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -5,7 +5,7 @@ metadata:
spec: spec:
terminationGracePeriodSeconds: 0 terminationGracePeriodSeconds: 0
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -18,7 +18,7 @@ spec:
team: devops team: devops
weight: 1 weight: 1
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -18,7 +18,7 @@ spec:
team: devops team: devops
weight: 1 weight: 1
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -14,7 +14,7 @@ spec:
- zone1 - zone1
- zone2 - zone2
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - 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 topologyKey: topology.kubernetes.io/zone
namespaces: ["sched-1", "sched-0"] namespaces: ["sched-1", "sched-0"]
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - 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 topologyKey: kubernetes.io/hostname
namespaces: ["sched-1", "sched-0"] namespaces: ["sched-1", "sched-0"]
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - 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"] namespaces: ["sched-1", "sched-0"]
weight: 1 weight: 1
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - 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"] namespaces: ["sched-1", "sched-0"]
weight: 1 weight: 1
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -13,7 +13,7 @@ spec:
matchLabels: matchLabels:
color: blue color: blue
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -4,7 +4,7 @@ metadata:
generateName: secret-volume- generateName: secret-volume-
spec: spec:
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -13,7 +13,7 @@ spec:
matchLabels: matchLabels:
color: blue color: blue
containers: containers:
- image: k8s.gcr.io/pause:3.6 - image: k8s.gcr.io/pause:3.7
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

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

4
test/utils/runners.go
View File

@ -1319,7 +1319,7 @@ func MakePodSpec() v1.PodSpec {
return v1.PodSpec{ return v1.PodSpec{
Containers: []v1.Container{{ Containers: []v1.Container{{
Name: "pause", Name: "pause",
Image: "k8s.gcr.io/pause:3.6", Image: "k8s.gcr.io/pause:3.7",
Ports: []v1.ContainerPort{{ContainerPort: 80}}, Ports: []v1.ContainerPort{{ContainerPort: 80}},
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{ Limits: v1.ResourceList{
@ -1741,7 +1741,7 @@ type DaemonConfig struct {
func (config *DaemonConfig) Run() error { func (config *DaemonConfig) Run() error {
if config.Image == "" { if config.Image == "" {
config.Image = "k8s.gcr.io/pause:3.6" config.Image = "k8s.gcr.io/pause:3.7"
} }
nameLabel := map[string]string{ nameLabel := map[string]string{
"name": config.Name + "-daemon", "name": config.Name + "-daemon",