bump pause to 3.2 in test/

This commit is contained in:
Benjamin Elder 2020-02-14 11:37:07 -08:00
parent 1631825e44
commit 3fb7183215
13 changed files with 16 additions and 16 deletions

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"

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

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

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"
}] }]
} }
} }

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

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

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

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

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

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

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

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"}

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",