Skip to content

Update pause image to 3.10 #8382

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
merged 2 commits into from
Aug 16, 2024
Merged

Update pause image to 3.10 #8382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff04753
updates pause image to 3.10
tukwila May 25, 2024
c8ff7ae
Add pause image to dependencies.yaml
PannagaRao Jul 12, 2024
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
16 changes: 16 additions & 0 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,3 +120,19 @@ dependencies:
refPaths:
- path: Makefile
match: MDTOC_VERSION

- name: pause
version: 3.10
refPaths:
- path: docs/crio.8.md
match: "registry.k8s.io/pause:"
- path: docs/crio.conf.5.md
match: "registry.k8s.io/pause:"
- path: internal/storage/image_test.go
match: "registry.k8s.io/pause:"
- path: pkg/config/config_linux.go
match: "registry.k8s.io/pause:"
- path: pkg/config/config_unsupported.go
match: "registry.k8s.io/pause:"
- path: test/common.sh
match: "registry.k8s.io/pause:"
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 @@ -364,7 +364,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: "registry.k8s.io/pause:3.9")
**--pause-image**="": Image which contains the pause executable. (default: "registry.k8s.io/pause:3.10")

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

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 @@ -441,7 +441,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**="registry.k8s.io/pause:3.9"
**pause_image**="registry.k8s.io/pause:3.10"
The on-registry image used to instantiate infra containers.
The value should start with a registry host name.
This option supports live configuration reload.
Expand Down
4 changes: 2 additions & 2 deletions internal/storage/image_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,12 +653,12 @@ var _ = t.Describe("Image", func() {

t.Describe("CompileRegexpsForPinnedImages", func() {
It("should return regexps for exact patterns", func() {
patterns := []string{"quay.io/crio/pause:latest", "docker.io/crio/sandbox:latest", "registry.k8s.io/pause:3.9"}
patterns := []string{"quay.io/crio/pause:latest", "docker.io/crio/sandbox:latest", "registry.k8s.io/pause:3.10"}
regexps := storage.CompileRegexpsForPinnedImages(patterns)
Expect(regexps).To(HaveLen(len(patterns)))
Expect(regexps[0].MatchString("quay.io/crio/pause:latest")).To(BeTrue())
Expect(regexps[1].MatchString("docker.io/crio/sandbox:latest")).To(BeTrue())
Expect(regexps[2].MatchString("registry.k8s.io/pause:3.9")).To(BeTrue())
Expect(regexps[2].MatchString("registry.k8s.io/pause:3.10")).To(BeTrue())
})

It("should return regexps for keyword patterns", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const (
// ImageVolumesBind option is for using bind mounted volumes.
ImageVolumesBind ImageVolumesType = "bind"
// DefaultPauseImage is default pause image.
DefaultPauseImage string = "registry.k8s.io/pause:3.9"
DefaultPauseImage string = "registry.k8s.io/pause:3.10"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config_unsupported.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const (
// ImageVolumesBind option is for using bind mounted volumes
ImageVolumesBind ImageVolumesType = "invalid ImageVolumesBind"
// DefaultPauseImage is default pause image
DefaultPauseImage string = "registry.k8s.io/pause:3.9"
DefaultPauseImage string = "registry.k8s.io/pause:3.10"
)

func selinuxEnabled() bool {
Expand Down
2 changes: 1 addition & 1 deletion test/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ ARCH=$(uname -m)
ARCH_X86_64=x86_64

IMAGES=(
registry.k8s.io/pause:3.9
registry.k8s.io/pause:3.10
quay.io/crio/fedora-crio-ci:latest
quay.io/crio/hello-wasm:latest
)
Expand Down