update pause to 3.4.1 for tests(e2e)

Signed-off-by: pacoxu <paco.xu@daocloud.io>
This commit is contained in:
pacoxu 2021-02-01 11:53:01 +08:00
parent f4d843682d
commit 0c152cbbbe
22 changed files with 28 additions and 27 deletions

View File

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

View File

@ -13,7 +13,7 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: k8s.gcr.io/pause:3.2 image: k8s.gcr.io/pause:3.4.1
--- ---
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.2 image: k8s.gcr.io/pause:3.4.1

View File

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

View File

@ -529,9 +529,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.2"}]}}' 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.4.1"}]}}'
# 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.2:' kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.4.1:'
# pod has field for kubectl patch field manager # pod has field for kubectl patch field manager
output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1) output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1)

View File

@ -76,5 +76,6 @@ spec:
- name: root-mount - name: root-mount
mountPath: /root mountPath: /root
containers: containers:
- image: "k8s.gcr.io/pause:3.2" - image: "k8s.gcr.io/pause:3.4.1"
name: pause name: pause

View File

@ -13,7 +13,7 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: k8s.gcr.io/pause:3.2 image: k8s.gcr.io/pause:3.4.1
--- ---
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.2 image: k8s.gcr.io/pause:3.4.1

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -5,7 +5,7 @@ metadata:
spec: spec:
terminationGracePeriodSeconds: 0 terminationGracePeriodSeconds: 0
containers: containers:
- image: k8s.gcr.io/pause:3.2 - image: k8s.gcr.io/pause:3.4.1
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.2 - image: k8s.gcr.io/pause:3.4.1
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

View File

@ -14,7 +14,7 @@ spec:
topologyKey: topology.kubernetes.io/zone topologyKey: topology.kubernetes.io/zone
namespaces: ["sched-test", "sched-setup"] namespaces: ["sched-test", "sched-setup"]
containers: containers:
- image: k8s.gcr.io/pause:3.2 - image: k8s.gcr.io/pause:3.4.1
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

View File

@ -14,7 +14,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.2 - image: k8s.gcr.io/pause:3.4.1
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.2 - image: k8s.gcr.io/pause:3.4.1
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.2 - image: k8s.gcr.io/pause:3.4.1
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

View File

@ -13,7 +13,7 @@ spec:
matchLabels: matchLabels:
color: blue color: blue
containers: containers:
- image: k8s.gcr.io/pause:3.2 - image: k8s.gcr.io/pause:3.4.1
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.2 - image: k8s.gcr.io/pause:3.4.1
name: pause name: pause
ports: ports:
- containerPort: 80 - containerPort: 80

View File

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

View File

@ -248,7 +248,7 @@ func initImageConfigs() (map[int]Config, map[int]Config) {
configs[Nonewprivs] = Config{promoterE2eRegistry, "nonewprivs", "1.3"} configs[Nonewprivs] = Config{promoterE2eRegistry, "nonewprivs", "1.3"}
configs[NonRoot] = Config{promoterE2eRegistry, "nonroot", "1.1"} configs[NonRoot] = Config{promoterE2eRegistry, "nonroot", "1.1"}
// 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.2"} configs[Pause] = Config{gcRegistry, "pause", "3.4.1"}
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

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