mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-05-28 04:04:39 -04:00
pause: fix version drift in various files
The latest pause version is 3.10.2 but due to the introduction of the PATCH level version to the pause image (previously was only MAJOR.MINOR), various files have remained on an older version. Either 3.10 or 3.10.1. Our validation with build/dependencies.yaml ./hack/verify-external-dependencies.sh did not account for that.
This commit is contained in:
parent
d3b9c54bd9
commit
bc2179d882
22 changed files with 25 additions and 25 deletions
|
|
@ -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.10"
|
||||
export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.10.2"
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -3285,7 +3285,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.10"}"
|
||||
sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.10.2"}"
|
||||
[plugins."io.containerd.grpc.v1.cri".cni]
|
||||
bin_dir = "${KUBE_HOME}/bin"
|
||||
conf_dir = "/etc/cni/net.d"
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: pause-win
|
||||
image: registry.k8s.io/pause:3.10
|
||||
image: registry.k8s.io/pause:3.10.2
|
||||
nodeSelector:
|
||||
kubernetes.io/os: windows
|
||||
tolerations:
|
||||
|
|
|
|||
|
|
@ -442,7 +442,7 @@ const (
|
|||
ModeNode string = "Node"
|
||||
|
||||
// PauseVersion indicates the default pause image version for kubeadm
|
||||
PauseVersion = "3.10.1"
|
||||
PauseVersion = "3.10.2"
|
||||
|
||||
// CgroupDriverSystemd holds the systemd driver type
|
||||
CgroupDriverSystemd = "systemd"
|
||||
|
|
|
|||
2
hack/testdata/pod-with-precision.json
vendored
2
hack/testdata/pod-with-precision.json
vendored
|
|
@ -9,7 +9,7 @@
|
|||
"containers": [
|
||||
{
|
||||
"name": "kubernetes-pause",
|
||||
"image": "registry.k8s.io/pause:3.10.1"
|
||||
"image": "registry.k8s.io/pause:3.10.2"
|
||||
}
|
||||
],
|
||||
"restartPolicy": "Never",
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: mock-container
|
||||
image: registry.k8s.io/pause:3.10
|
||||
image: registry.k8s.io/pause:3.10.2
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ReplicationController
|
||||
|
|
@ -30,4 +30,4 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: mock-container
|
||||
image: registry.k8s.io/pause:3.10
|
||||
image: registry.k8s.io/pause:3.10.2
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: mock-container
|
||||
image: registry.k8s.io/pause:3.10
|
||||
image: registry.k8s.io/pause:3.10.2
|
||||
|
|
|
|||
|
|
@ -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.10.1"}]}}'
|
||||
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.2"}]}}'
|
||||
# Post-condition: valid-pod POD has expected image
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.10.1:'
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.10.2:'
|
||||
|
||||
# pod has field for kubectl patch field manager
|
||||
output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: mock-container
|
||||
image: registry.k8s.io/pause:3.10.1
|
||||
image: registry.k8s.io/pause:3.10.2
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ReplicationController
|
||||
|
|
@ -30,4 +30,4 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: mock-container
|
||||
image: registry.k8s.io/pause:3.10.1
|
||||
image: registry.k8s.io/pause:3.10.2
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ spec:
|
|||
spec:
|
||||
containers:
|
||||
- name: mock-container
|
||||
image: registry.k8s.io/pause:3.10.1
|
||||
image: registry.k8s.io/pause:3.10.2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
pause 3.10.1 testing
|
||||
pause 3.10.2 testing
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
"spec": {
|
||||
"containers": [{
|
||||
"name": "test-container",
|
||||
"image": "registry.k8s.io/pause:3.10.1"
|
||||
"image": "registry.k8s.io/pause:3.10.2"
|
||||
}]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ metadata:
|
|||
generateName: pod-
|
||||
spec:
|
||||
containers:
|
||||
- image: registry.k8s.io/pause:3.10.1
|
||||
- image: registry.k8s.io/pause:3.10.2
|
||||
name: pause
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ spec:
|
|||
- zone1
|
||||
- zone2
|
||||
containers:
|
||||
- image: registry.k8s.io/pause:3.10.1
|
||||
- image: registry.k8s.io/pause:3.10.2
|
||||
name: pause
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ spec:
|
|||
topologyKey: topology.kubernetes.io/zone
|
||||
namespaces: ["sched-1", "sched-0"]
|
||||
containers:
|
||||
- image: registry.k8s.io/pause:3.10.1
|
||||
- image: registry.k8s.io/pause:3.10.2
|
||||
name: pause
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ spec:
|
|||
topologyKey: kubernetes.io/hostname
|
||||
namespaces: ["sched-1", "sched-0"]
|
||||
containers:
|
||||
- image: registry.k8s.io/pause:3.10.1
|
||||
- image: registry.k8s.io/pause:3.10.2
|
||||
name: pause
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ spec:
|
|||
namespaces: ["sched-1", "sched-0"]
|
||||
weight: 1
|
||||
containers:
|
||||
- image: registry.k8s.io/pause:3.10.1
|
||||
- image: registry.k8s.io/pause:3.10.2
|
||||
name: pause
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ spec:
|
|||
namespaces: ["sched-1", "sched-0"]
|
||||
weight: 1
|
||||
containers:
|
||||
- image: registry.k8s.io/pause:3.10.1
|
||||
- image: registry.k8s.io/pause:3.10.2
|
||||
name: pause
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ spec:
|
|||
matchLabels:
|
||||
color: blue
|
||||
containers:
|
||||
- image: registry.k8s.io/pause:3.10.1
|
||||
- image: registry.k8s.io/pause:3.10.2
|
||||
name: pause
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ metadata:
|
|||
generateName: secret-volume-
|
||||
spec:
|
||||
containers:
|
||||
- image: registry.k8s.io/pause:3.10.1
|
||||
- image: registry.k8s.io/pause:3.10.2
|
||||
name: pause
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ spec:
|
|||
matchLabels:
|
||||
color: blue
|
||||
containers:
|
||||
- image: registry.k8s.io/pause:3.10.1
|
||||
- image: registry.k8s.io/pause:3.10.2
|
||||
name: pause
|
||||
ports:
|
||||
- containerPort: 80
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
|
|||
configs[Nonewprivs] = Config{list.PromoterE2eRegistry, "nonewprivs", "1.4"}
|
||||
configs[NonRoot] = Config{list.PromoterE2eRegistry, "nonroot", "1.5"}
|
||||
// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
|
||||
configs[Pause] = Config{list.GcRegistry, "pause", "3.10.1"}
|
||||
configs[Pause] = Config{list.GcRegistry, "pause", "3.10.2"}
|
||||
configs[Perl] = Config{list.PromoterE2eRegistry, "perl", "5.26"}
|
||||
configs[RegressionIssue74839] = Config{list.PromoterE2eRegistry, "regression-issue-74839", "1.4"}
|
||||
configs[ResourceConsumer] = Config{list.PromoterE2eRegistry, "resource-consumer", "1.14"}
|
||||
|
|
|
|||
Loading…
Reference in a new issue