Switching everything to use pause:3.8

Signed-off-by: Mark Rossetti <marosset@microsoft.com>
This commit is contained in:
Mark Rossetti
2022-07-21 14:38:32 -07:00
parent 3c034ba053
commit 40f3e624a6
54 changed files with 65 additions and 65 deletions

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": "registry.k8s.io/pause:3.7"}]}}'
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.8"}]}}'
# Post-condition: valid-pod POD has expected image
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.7:'
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'registry.k8s.io/pause:3.8:'
# pod has field for kubectl patch field manager
output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1)

View File

@@ -81,6 +81,6 @@ spec:
- name: root-mount
mountPath: /root
containers:
- image: "registry.k8s.io/pause:3.7"
- image: "registry.k8s.io/pause:3.8"
name: pause

View File

@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.7
image: registry.k8s.io/pause:3.8
---
apiVersion: v1
kind: ReplicationController
@@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.7
image: registry.k8s.io/pause:3.8

View File

@@ -14,4 +14,4 @@ spec:
spec:
containers:
- name: mock-container
image: registry.k8s.io/pause:3.7
image: registry.k8s.io/pause:3.8

View File

@@ -17,7 +17,7 @@
"spec": {
"containers": [{
"name": "test-container",
"image": "registry.k8s.io/pause:3.7"
"image": "registry.k8s.io/pause:3.8"
}]
}
}

View File

@@ -4,5 +4,5 @@ metadata:
generateName: pod-churn-
spec:
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause

View File

@@ -16,7 +16,7 @@ spec:
matchLabels:
team: devops
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -16,7 +16,7 @@ spec:
matchLabels:
team: devops
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -4,7 +4,7 @@ metadata:
generateName: pod-
spec:
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -5,7 +5,7 @@ metadata:
spec:
priority: 10
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -5,7 +5,7 @@ metadata:
spec:
priority: 10
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -4,7 +4,7 @@ metadata:
generateName: pod-
spec:
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -5,7 +5,7 @@ metadata:
spec:
terminationGracePeriodSeconds: 0
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -18,7 +18,7 @@ spec:
team: devops
weight: 1
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -18,7 +18,7 @@ spec:
team: devops
weight: 1
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -14,7 +14,7 @@ spec:
- zone1
- zone2
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -14,7 +14,7 @@ spec:
topologyKey: topology.kubernetes.io/zone
namespaces: ["sched-1", "sched-0"]
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -14,7 +14,7 @@ spec:
topologyKey: kubernetes.io/hostname
namespaces: ["sched-1", "sched-0"]
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -16,7 +16,7 @@ spec:
namespaces: ["sched-1", "sched-0"]
weight: 1
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -16,7 +16,7 @@ spec:
namespaces: ["sched-1", "sched-0"]
weight: 1
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -13,7 +13,7 @@ spec:
matchLabels:
color: blue
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -4,7 +4,7 @@ metadata:
generateName: secret-volume-
spec:
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -13,7 +13,7 @@ spec:
matchLabels:
color: blue
containers:
- image: registry.k8s.io/pause:3.7
- image: registry.k8s.io/pause:3.8
name: pause
ports:
- containerPort: 80

View File

@@ -259,7 +259,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
configs[Nonewprivs] = Config{list.PromoterE2eRegistry, "nonewprivs", "1.3"}
configs[NonRoot] = Config{list.PromoterE2eRegistry, "nonroot", "1.2"}
// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
configs[Pause] = Config{list.GcRegistry, "pause", "3.7"}
configs[Pause] = Config{list.GcRegistry, "pause", "3.8"}
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"}

View File

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