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

updates pause image references

Browse Source 
The pause:3.6 image has been published.

Also updates older / incorrect references.
This commit is contained in:
Claudiu Belu 2021-08-29 13:53:52 -07:00
parent 7a0638da76
commit 18936d4785
56 changed files with 71 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.yaml
View File

@ -154,7 +154,7 @@ dependencies:
match: TAG\s*\?=
- name: "k8s.gcr.io/pause: dependents"
version: 3.5
version: 3.6
refPaths:
- path: cmd/kubeadm/app/constants/constants.go
match: PauseVersion\s+=

4
build/pause/CHANGELOG.md
View File

@ -1,3 +1,7 @@
# 3.6
* Support for Windows container images (OS Versions: 2022) was added. ([#104438](https://github.com/kubernetes/kubernetes/pull/104438), [@nick5616](https://github.com/nick5616))
# 3.5
* Run the container image as non root user per default ([#97963](https://github.com/kubernetes/kubernetes/pull/97963))

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.
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.5"
export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.6"
# 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/windows/smoke-test.sh
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6
---
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: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6
---
apiVersion: v1
kind: Pod
@ -17,7 +17,7 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6
---
apiVersion: v1
kind: Pod
@ -26,5 +26,5 @@ metadata:
spec:
containers:
- name: kubernetes-pause
image: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6

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

@ -43,7 +43,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "k8s.gcr.io/pause:3.5",
"image": "k8s.gcr.io/pause:3.6",
"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": "k8s.gcr.io/pause:3.5",
"image": "k8s.gcr.io/pause:3.6",
"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": "k8s.gcr.io/pause:3.5",
"image": "k8s.gcr.io/pause:3.6",
"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": "k8s.gcr.io/pause:3.5",
"image": "k8s.gcr.io/pause:3.6",
"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": "k8s.gcr.io/pause:3.5",
"image": "k8s.gcr.io/pause:3.6",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
@ -60,7 +60,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "k8s.gcr.io/pause:3.5",
"image": "k8s.gcr.io/pause:3.6",
"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": "k8s.gcr.io/pause:3.5",
"image": "k8s.gcr.io/pause:3.6",
"ports":[{
"containerPort":9949,
"protocol":"TCP"
@ -60,7 +60,7 @@
"spec":{
"containers":[{
"name": "mock-container",
"image": "k8s.gcr.io/pause:3.5",
"image": "k8s.gcr.io/pause:3.6",
"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: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6

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

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

2
hack/testdata/pod.yaml vendored
View File

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

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

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

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

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

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

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

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

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

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

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

2
pkg/kubelet/dockershim/docker_sandbox.go
View File

@ -41,7 +41,7 @@ import (
)
const (
defaultSandboxImage = "k8s.gcr.io/pause:3.5"
defaultSandboxImage = "k8s.gcr.io/pause:3.6"
// Various default sandbox resources requests/limits.
defaultSandboxCPUshares int64 = 2

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: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6
---
apiVersion: v1
kind: ReplicationController
@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: mock-container
image: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6

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: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6

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": "k8s.gcr.io/pause:3.5"}]}}'
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"}]}}'
# Post-condition: valid-pod POD has expected image
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.5:'
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.6:'
# pod has field for kubectl patch field manager
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
mountPath: /root
containers:
- image: "k8s.gcr.io/pause:3.5"
- image: "k8s.gcr.io/pause:3.6"
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: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6
---
apiVersion: v1
kind: ReplicationController
@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: mock-container
image: k8s.gcr.io/pause:3.5
image: k8s.gcr.io/pause:3.6

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

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

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

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

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

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

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

@ -16,7 +16,7 @@ spec:
matchLabels:
team: devops
containers:
- image: k8s.gcr.io/pause:3.4.1
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.4.1
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.2
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.4.1
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.4.1
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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-test", "sched-setup"]
containers:
- image: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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-test", "sched-setup"]
containers:
- image: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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-test", "sched-setup"]
weight: 1
containers:
- image: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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-test", "sched-setup"]
weight: 1
containers:
- image: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
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: k8s.gcr.io/pause:3.5
- image: k8s.gcr.io/pause:3.6
name: pause
ports:
- containerPort: 80

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

@ -228,7 +228,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.1"}
// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
configs[Pause] = Config{list.GcRegistry, "pause", "3.5"}
configs[Pause] = Config{list.GcRegistry, "pause", "3.6"}
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"}

4
test/utils/runners.go
View File

@ -1319,7 +1319,7 @@ func MakePodSpec() v1.PodSpec {
return v1.PodSpec{
Containers: []v1.Container{{
Name: "pause",
Image: "k8s.gcr.io/pause:3.5",
Image: "k8s.gcr.io/pause:3.6",
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.5"
config.Image = "k8s.gcr.io/pause:3.6"
}
nameLabel := map[string]string{
"name": config.Name + "-daemon",