github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7359 from lengrongfu/feat_upgrade_pause_version

Browse Source
This commit is contained in:
Fu Wei 2022-09-06 18:38:22 +08:00 committed by GitHub
commit 851bfe8c06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/images/image_list.go
View File

@ -49,7 +49,7 @@ func initImages(imageListFile string) {
imageList = ImageList{ imageList = ImageList{
Alpine: "docker.io/library/alpine:latest", Alpine: "docker.io/library/alpine:latest",
BusyBox: "docker.io/library/busybox:latest", BusyBox: "docker.io/library/busybox:latest",
Pause: "registry.k8s.io/pause:3.7", Pause: "registry.k8s.io/pause:3.8",
ResourceConsumer: "registry.k8s.io/e2e-test-images/resource-consumer:1.10", ResourceConsumer: "registry.k8s.io/e2e-test-images/resource-consumer:1.10",
VolumeCopyUp: "ghcr.io/containerd/volume-copy-up:2.1", VolumeCopyUp: "ghcr.io/containerd/volume-copy-up:2.1",
VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1", VolumeOwnership: "ghcr.io/containerd/volume-ownership:2.1",

2
pkg/cri/config/config_unix.go
View File

@ -94,7 +94,7 @@ func DefaultConfig() PluginConfig {
TLSKeyFile: "", TLSKeyFile: "",
TLSCertFile: "", TLSCertFile: "",
}, },
SandboxImage: "registry.k8s.io/pause:3.7", SandboxImage: "registry.k8s.io/pause:3.8",
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
SystemdCgroup: false, SystemdCgroup: false,
MaxContainerLogLineSize: 16 * 1024, MaxContainerLogLineSize: 16 * 1024,

2
pkg/cri/config/config_windows.go
View File

@ -53,7 +53,7 @@ func DefaultConfig() PluginConfig {
TLSKeyFile: "", TLSKeyFile: "",
TLSCertFile: "", TLSCertFile: "",
}, },
SandboxImage: "registry.k8s.io/pause:3.7", SandboxImage: "registry.k8s.io/pause:3.8",
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
MaxContainerLogLineSize: 16 * 1024, MaxContainerLogLineSize: 16 * 1024,
MaxConcurrentDownloads: 3, MaxConcurrentDownloads: 3,