Switch to pause 3.7

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

View File

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

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.
export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig"
# 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.
export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
# Version for csi-proxy

View File

@ -3087,7 +3087,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:-"k8s.gcr.io/pause:3.6"}"
sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"k8s.gcr.io/pause:3.7"}"
[plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "${KUBE_HOME}/bin"
conf_dir = "/etc/cni/net.d"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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": "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
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
output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -14,7 +14,7 @@ spec:
- zone1
- zone2
containers:
- image: k8s.gcr.io/pause:3.6
- image: k8s.gcr.io/pause:3.7
name: pause
ports:
- containerPort: 80

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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[NonRoot] = Config{list.PromoterE2eRegistry, "nonroot", "1.2"}
// 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[PrometheusDummyExporter] = Config{list.GcRegistry, "prometheus-dummy-exporter", "v0.1.0"}
configs[PrometheusToSd] = Config{list.GcRegistry, "prometheus-to-sd", "v0.5.0"}

View File

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