Skip to content

Commit 6da9476

Browse files
committed
feat: use kubernetes device ownership setting
1 parent 21a9193 commit 6da9476

File tree

3 files changed

+41
-40
lines changed

3 files changed

+41
-40
lines changed

packages/containerd/containerd-config-toml_k8s_containerd_sock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
container-registry = "v1"
33
container-runtime = "v1"
44
kubernetes = "v1"
5-
std = { version = "v1", helpers = ["join_array"]}
5+
std = { version = "v1", helpers = ["join_array", "default"]}
66
+++
77
version = 2
88
root = "/var/lib/containerd"
@@ -19,6 +19,7 @@ disabled_plugins = [
1919
address = "/run/containerd/containerd.sock"
2020

2121
[plugins."io.containerd.grpc.v1.cri"]
22+
device_ownership_from_security_context = {{default false settings.kubernetes.device-ownership-from-security-context}}
2223
enable_selinux = true
2324
# Pause container image is specified here, shares the same image as kubelet's pod-infra-container-image
2425
sandbox_image = "localhost/kubernetes/pause:0.1.0"

sources/Cargo.lock

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sources/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,13 @@ base64 = "0.22"
211211

212212
[workspace.dependencies.bottlerocket-modeled-types]
213213
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
214-
tag = "bottlerocket-settings-models-v0.6.0"
215-
version = "0.6.0"
214+
tag = "bottlerocket-settings-models-v0.7.0"
215+
version = "0.7.0"
216216

217217
[workspace.dependencies.bottlerocket-settings-models]
218218
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
219-
tag = "bottlerocket-settings-models-v0.6.0"
220-
version = "0.6.0"
219+
tag = "bottlerocket-settings-models-v0.7.0"
220+
version = "0.7.0"
221221

222222
[workspace.dependencies.bottlerocket-settings-plugin]
223223
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
@@ -226,7 +226,7 @@ version = "0.1.0"
226226

227227
[workspace.dependencies.settings-extension-oci-defaults]
228228
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
229-
tag = "bottlerocket-settings-models-v0.6.0"
229+
tag = "bottlerocket-settings-models-v0.7.0"
230230
version = "0.1.0"
231231

232232
[profile.release]

0 commit comments

Comments
 (0)