From 161bd55ab2030502db82641af68adc1d77a24acb Mon Sep 17 00:00:00 2001
From: James <github@j4m3s.eu>
Date: Mon, 22 May 2023 15:49:03 +0000
Subject: [PATCH] Remove deprecated crio_pids_limits (#10056)

As per https://github.com/cri-o/cri-o/pull/5831, option is now
deprecated.
---
 docs/cri-o.md                                      | 14 --------------
 roles/container-engine/cri-o/defaults/main.yml     |  4 ----
 .../container-engine/cri-o/templates/crio.conf.j2  |  3 ---
 3 files changed, 21 deletions(-)

diff --git a/docs/cri-o.md b/docs/cri-o.md
index 43be723e1..213c39a01 100644
--- a/docs/cri-o.md
+++ b/docs/cri-o.md
@@ -40,21 +40,7 @@ crio_registries:
         insecure: false
 ```
 
-## Note about pids_limit
-
-For heavily mult-threaded workloads like databases, the default of 1024 for pids-limit is too low.
-This parameter controls not just the number of processes but also the amount of threads
-(since a thread is technically a process with shared memory). See [cri-o#1921]
-
-In order to increase the default `pids_limit` for cri-o based deployments you need to set the `crio_pids_limit`
-for your `k8s_cluster` ansible group or per node depending on the use case.
-
-```yaml
-crio_pids_limit: 4096
-```
-
 [CRI-O]: https://cri-o.io/
-[cri-o#1921]: https://github.com/cri-o/cri-o/issues/1921
 
 ## Note about user namespaces
 
diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml
index 6b757fe15..d2c087b8d 100644
--- a/roles/container-engine/cri-o/defaults/main.yml
+++ b/roles/container-engine/cri-o/defaults/main.yml
@@ -73,10 +73,6 @@ youki_runtime:
 crio_download_base: "download.opensuse.org/repositories/devel:kubic:libcontainers:stable"
 crio_download_crio: "http://{{ crio_download_base }}:/cri-o:/"
 
-# Configure the cri-o pids limit, increase this for heavily multi-threaded workloads
-# see https://github.com/cri-o/cri-o/issues/1921
-crio_pids_limit: 1024
-
 # Reserve 16M uids and gids for user namespaces (256 pods * 65536 uids/gids)
 # at the end of the uid/gid space
 crio_remap_enable: false
diff --git a/roles/container-engine/cri-o/templates/crio.conf.j2 b/roles/container-engine/cri-o/templates/crio.conf.j2
index 8409feacb..c8a3741bf 100644
--- a/roles/container-engine/cri-o/templates/crio.conf.j2
+++ b/roles/container-engine/cri-o/templates/crio.conf.j2
@@ -205,9 +205,6 @@ default_mounts = [
 #
 #default_mounts_file = ""
 
-# Maximum number of processes allowed in a container.
-pids_limit = {{ crio_pids_limit }}
-
 # Maximum sized allowed for the container log file. Negative numbers indicate
 # that no size limit is imposed. If it is positive, it must be >= 8192 to
 # match/exceed conmon's read buffer. The file is truncated and re-opened so the