Skip to content

Commit 9d6a3da

Browse files
committed
Upgrade crio.conf to version v1.19.0
1 parent ead11c6 commit 9d6a3da

File tree

2 files changed

+36
-10
lines changed

2 files changed

+36
-10
lines changed

deploy/iso/minikube-iso/package/crio-bin/crio.conf

+18-5
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ grpc_max_recv_msg_size = 16777216
9393
#]
9494

9595
# default_runtime is the _name_ of the OCI runtime to be used as the default.
96-
# The name is matched against the runtimes map below.
96+
# The name is matched against the runtimes map below. If this value is changed,
97+
# the corresponding existing entry from the runtimes map below will be ignored.
9798
default_runtime = "runc"
9899

99100
# If true, the runtime will not use pivot_root, but instead use MS_MOVE.
@@ -241,12 +242,15 @@ gid_mappings = ""
241242
# value is 30s, whereas lower values are not considered by CRI-O.
242243
ctr_stop_timeout = 30
243244

244-
# **DEPRECATED** this option is being replaced by manage_ns_lifecycle, which is described below.
245-
# manage_network_ns_lifecycle = false
246-
247245
# manage_ns_lifecycle determines whether we pin and remove namespaces
248246
# and manage their lifecycle
249-
manage_ns_lifecycle = false
247+
manage_ns_lifecycle = true
248+
249+
# drop_infra_ctr determines whether CRI-O drops the infra container
250+
# when a pod does not have a private PID namespace, and does not use
251+
# a kernel separating runtime (like kata).
252+
# It requires manage_ns_lifecycle to be true.
253+
drop_infra_ctr = false
250254

251255
# The directory where the state of the managed namespaces gets tracked.
252256
# Only used when manage_ns_lifecycle is true.
@@ -283,6 +287,10 @@ runtime_type = "oci"
283287
runtime_root = "/run/runc"
284288

285289

290+
# crun is a fast and lightweight fully featured OCI runtime and C library for
291+
# running containers
292+
#[crio.runtime.runtimes.crun]
293+
286294
# Kata Containers is an OCI runtime, where containers are run inside lightweight
287295
# VMs. Kata provides additional isolation towards the host, minimizing the host attack
288296
# surface and mitigating the consequences of containers breakout.
@@ -352,6 +360,8 @@ registries = [
352360
"docker.io"
353361
]
354362

363+
# Temporary directory to use for storing big files
364+
big_files_temporary_dir = ""
355365

356366
# The crio.network table containers settings pertaining to the management of
357367
# CNI plugins.
@@ -377,3 +387,6 @@ enable_metrics = true
377387

378388
# The port on which the metrics server will listen.
379389
metrics_port = 9090
390+
391+
# Local socket path to bind the metrics server to
392+
metrics_socket = ""

deploy/iso/minikube-iso/package/crio-bin/crio.conf.default

+18-5
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ grpc_max_recv_msg_size = 16777216
9393
#]
9494

9595
# default_runtime is the _name_ of the OCI runtime to be used as the default.
96-
# The name is matched against the runtimes map below.
96+
# The name is matched against the runtimes map below. If this value is changed,
97+
# the corresponding existing entry from the runtimes map below will be ignored.
9798
default_runtime = "runc"
9899

99100
# If true, the runtime will not use pivot_root, but instead use MS_MOVE.
@@ -241,12 +242,15 @@ gid_mappings = ""
241242
# value is 30s, whereas lower values are not considered by CRI-O.
242243
ctr_stop_timeout = 30
243244

244-
# **DEPRECATED** this option is being replaced by manage_ns_lifecycle, which is described below.
245-
# manage_network_ns_lifecycle = false
246-
247245
# manage_ns_lifecycle determines whether we pin and remove namespaces
248246
# and manage their lifecycle
249-
manage_ns_lifecycle = false
247+
manage_ns_lifecycle = true
248+
249+
# drop_infra_ctr determines whether CRI-O drops the infra container
250+
# when a pod does not have a private PID namespace, and does not use
251+
# a kernel separating runtime (like kata).
252+
# It requires manage_ns_lifecycle to be true.
253+
drop_infra_ctr = false
250254

251255
# The directory where the state of the managed namespaces gets tracked.
252256
# Only used when manage_ns_lifecycle is true.
@@ -283,6 +287,10 @@ runtime_type = "oci"
283287
runtime_root = "/run/runc"
284288

285289

290+
# crun is a fast and lightweight fully featured OCI runtime and C library for
291+
# running containers
292+
#[crio.runtime.runtimes.crun]
293+
286294
# Kata Containers is an OCI runtime, where containers are run inside lightweight
287295
# VMs. Kata provides additional isolation towards the host, minimizing the host attack
288296
# surface and mitigating the consequences of containers breakout.
@@ -351,6 +359,8 @@ image_volumes = "mkdir"
351359
#registries = [
352360
# ]
353361

362+
# Temporary directory to use for storing big files
363+
big_files_temporary_dir = ""
354364

355365
# The crio.network table containers settings pertaining to the management of
356366
# CNI plugins.
@@ -376,3 +386,6 @@ enable_metrics = false
376386

377387
# The port on which the metrics server will listen.
378388
metrics_port = 9090
389+
390+
# Local socket path to bind the metrics server to
391+
metrics_socket = ""

0 commit comments

Comments
 (0)