Thanks to visit codestin.com
Credit goes to github.com

Skip to content

update pause image to 3.5（3.4.1 for multi-arch support and 3.5 for non-root） #4550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 31, 2021
Merged

update pause image to 3.5（3.4.1 for multi-arch support and 3.5 for non-root） #4550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/crio.8.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ crio [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]

**--pause-command**="": Path to the pause executable in the pause image (default: /pause)

**--pause-image**="": Image which contains the pause executable (default: k8s.gcr.io/pause:3.2)
**--pause-image**="": Image which contains the pause executable (default: k8s.gcr.io/pause:3.5)

**--pause-image-auth-file**="": Path to a config file containing credentials for --pause-image (default: "")

Expand Down
2 changes: 1 addition & 1 deletion docs/crio.conf.5.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ CRI-O reads its configured registries defaults from the system wide containers-r
**global_auth_file**=""
The path to a file like /var/lib/kubelet/config.json holding credentials necessary for pulling images from secure registries.

**pause_image**="k8s.gcr.io/pause:3.2"
**pause_image**="k8s.gcr.io/pause:3.5"
The image used to instantiate infra containers. This option supports live configuration reload.

**pause_image_auth_file**=""
Expand Down
9 changes: 4 additions & 5 deletions internal/config/migrate/from_1_17.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,10 @@ func migrateFrom1_17(cfg *config.Config) error {
}

// Upgrade pause image
// https://github.com/cri-o/cri-o/pull/3582
logrus.Infof("Checking for pause_image, which now should be k8s.gcr.io/pause:3.2 instead of k8s.gcr.io/pause:3.1")
newPauseImage := "k8s.gcr.io/pause:3.2"
if cfg.PauseImage == "k8s.gcr.io/pause:3.1" {
cfg.PauseImage = newPauseImage
// https://github.com/cri-o/cri-o/pull/4550
logrus.Infof("Checking for pause_image, which now should be %s instead of k8s.gcr.io/pause:3.1 or 3.2", config.DefaultPauseImage)
if cfg.PauseImage == "k8s.gcr.io/pause:3.1" || cfg.PauseImage == "k8s.gcr.io/pause:3.2" {
cfg.PauseImage = config.DefaultPauseImage
logrus.Infof(`Changing "pause_image" to %s`, cfg.PauseImage)
}

Expand Down
4 changes: 3 additions & 1 deletion pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ const (
ImageVolumesIgnore ImageVolumesType = "ignore"
// ImageVolumesBind option is for using bind mounted volumes
ImageVolumesBind ImageVolumesType = "bind"
// DefaultPauseImage is default pause image
DefaultPauseImage string = "k8s.gcr.io/pause:3.5"
)

const (
Expand Down Expand Up @@ -622,7 +624,7 @@ func DefaultConfig() (*Config, error) {
},
ImageConfig: ImageConfig{
DefaultTransport: "docker://",
PauseImage: "k8s.gcr.io/pause:3.2",
PauseImage: DefaultPauseImage,
PauseCommand: "/pause",
ImageVolumes: ImageVolumesMkdir,
},
Expand Down
2 changes: 1 addition & 1 deletion test/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ POD_IPV6_CIDR_START="1100:2"
POD_IPV6_DEF_ROUTE="1100:200::1/24"

IMAGES=(
k8s.gcr.io/pause:3.2
k8s.gcr.io/pause:3.5
quay.io/crio/busybox:latest
quay.io/crio/fedora-ping:latest
quay.io/crio/image-volume-test:latest
Expand Down