Skip to content

Commit

Permalink
Merge pull request cri-o#7503 from haircommander/fix-pids-limit-default
Browse files Browse the repository at this point in the history
config: set default pids limit to -1
  • Loading branch information
openshift-merge-bot[bot] committed Dec 5, 2023
2 parents c4afa28 + 37b3754 commit 98264a1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/crio.8.md
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ crio [GLOBAL OPTIONS] command [COMMAND OPTIONS] [ARGUMENTS...]

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

**--pids-limit**="": Maximum number of processes allowed in a container. This option is deprecated. The Kubelet flag '--pod-pids-limit' should be used instead. (default: 0)
**--pids-limit**="": Maximum number of processes allowed in a container. This option is deprecated. The Kubelet flag '--pod-pids-limit' should be used instead. (default: -1)

**--pinned-images**="": A list of images that will be excluded from the kubelet's garbage collection.

Expand Down
2 changes: 1 addition & 1 deletion docs/crio.conf.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ the container runtime configuration.

2) `/usr/share/containers/mounts.conf`: This is the default file read for mounts. If you want CRI-O to read from a different, specific mounts file, you can change the default_mounts_file. Note, if this is done, CRI-O will only add mounts it finds in this file.

**pids_limit**=0
**pids_limit**=-1
Maximum number of processes allowed in a container.
This option is deprecated. The Kubelet flag `--pod-pids-limit` should be used instead.

Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const (
const (
// DefaultPidsLimit is the default value for maximum number of processes
// allowed inside a container
DefaultPidsLimit = 0
DefaultPidsLimit = -1

// DefaultLogSizeMax is the default value for the maximum log size
// allowed for a container. Negative values mean that no limit is imposed.
Expand Down

0 comments on commit 98264a1

Please sign in to comment.