github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88173 from BenTheElder/gives-a-whole-new-pause

Browse Source 
upgrade pause everywhere
This commit is contained in:
Kubernetes Prow Robot 2020-02-15 02:11:27 -08:00 committed by GitHub
commit 1c60045db0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,7 +266,7 @@ const (
DefaultEtcdVersion = "3.4.3-0" DefaultEtcdVersion = "3.4.3-0"
// PauseVersion indicates the default pause image version for kubeadm // PauseVersion indicates the default pause image version for kubeadm
PauseVersion = "3.1" PauseVersion = "3.2"
// Etcd defines variable used internally when referring to etcd component // Etcd defines variable used internally when referring to etcd component
Etcd = "etcd" Etcd = "etcd"

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

@ -245,14 +245,14 @@ func TestBuildKubeletArgMap(t *testing.T) {
nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
CRISocket: "/var/run/dockershim.sock", CRISocket: "/var/run/dockershim.sock",
}, },
pauseImage: "gcr.io/pause:3.1", pauseImage: "gcr.io/pause:3.2",
execer: cgroupfsCgroupExecer, execer: cgroupfsCgroupExecer,
isServiceActiveFunc: serviceIsNotActiveFunc, isServiceActiveFunc: serviceIsNotActiveFunc,
}, },
expected: map[string]string{ expected: map[string]string{
"network-plugin": "cni", "network-plugin": "cni",
"cgroup-driver": "cgroupfs", "cgroup-driver": "cgroupfs",
"pod-infra-container-image": "gcr.io/pause:3.1", "pod-infra-container-image": "gcr.io/pause:3.2",
}, },
}, },
} }

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

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

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

@ -26,9 +26,9 @@ import (
) )
const ( const (
// When these values are updated, also update test/e2e/framework/util.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.1" defaultPodSandboxImageVersion = "3.2"
) )
var ( var (

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.1" "image": "k8s.gcr.io/pause:3.2"
} }
], ],
"restartPolicy": "Never", "restartPolicy": "Never",

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

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

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

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

4
test/cmd/core.sh
View File

@ -517,9 +517,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.1"}]}}' 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.2"}]}}'
# 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.1:' kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.2:'
## If resourceVersion is specified in the patch, it will be treated as a precondition, i.e., if the resourceVersion is different from that is stored in the server, the Patch should be rejected ## If resourceVersion is specified in the patch, it will be treated as a precondition, i.e., if the resourceVersion is different from that is stored in the server, the Patch should be rejected
ERROR_FILE="${KUBE_TEMP}/conflict-error" ERROR_FILE="${KUBE_TEMP}/conflict-error"

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

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

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.1" "image": "k8s.gcr.io/pause:3.2"
}] }]
} }
} }

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.1 - image: k8s.gcr.io/pause:3.2
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.1 - image: k8s.gcr.io/pause:3.2
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: failure-domain.beta.kubernetes.io/zone topologyKey: failure-domain.beta.kubernetes.io/zone
namespaces: ["sched-test", "sched-setup"] namespaces: ["sched-test", "sched-setup"]
containers: containers:
- image: k8s.gcr.io/pause:3.1 - image: k8s.gcr.io/pause:3.2
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -15,7 +15,7 @@ spec:
topologyKey: kubernetes.io/hostname topologyKey: kubernetes.io/hostname
namespaces: ["sched-test", "sched-setup"] namespaces: ["sched-test", "sched-setup"]
containers: containers:
- image: k8s.gcr.io/pause:3.1 - image: k8s.gcr.io/pause:3.2
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-test", "sched-setup"] namespaces: ["sched-test", "sched-setup"]
weight: 1 weight: 1
containers: containers:
- image: k8s.gcr.io/pause:3.1 - image: k8s.gcr.io/pause:3.2
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-test", "sched-setup"] namespaces: ["sched-test", "sched-setup"]
weight: 1 weight: 1
containers: containers:
- image: k8s.gcr.io/pause:3.1 - image: k8s.gcr.io/pause:3.2
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.1 - image: k8s.gcr.io/pause:3.2
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -236,7 +236,7 @@ func initImageConfigs() map[int]Config {
configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"} configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"}
configs[NonRoot] = Config{e2eRegistry, "nonroot", "1.0"} configs[NonRoot] = Config{e2eRegistry, "nonroot", "1.0"}
// 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{gcRegistry, "pause", "3.1"} configs[Pause] = Config{gcRegistry, "pause", "3.2"}
configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"} configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"}
configs[PrometheusDummyExporter] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"} configs[PrometheusDummyExporter] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"}
configs[PrometheusToSd] = Config{gcRegistry, "prometheus-to-sd", "v0.5.0"} configs[PrometheusToSd] = Config{gcRegistry, "prometheus-to-sd", "v0.5.0"}

4
test/utils/runners.go
View File

@ -1307,7 +1307,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.1", Image: "k8s.gcr.io/pause:3.2",
Ports: []v1.ContainerPort{{ContainerPort: 80}}, Ports: []v1.ContainerPort{{ContainerPort: 80}},
Resources: v1.ResourceRequirements{ Resources: v1.ResourceRequirements{
Limits: v1.ResourceList{ Limits: v1.ResourceList{
@ -1664,7 +1664,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.1" config.Image = "k8s.gcr.io/pause:3.2"
} }
nameLabel := map[string]string{ nameLabel := map[string]string{
"name": config.Name + "-daemon", "name": config.Name + "-daemon",