Skip to content

Commit c935dbf

Browse files
authored
fix: support katacc policy annotation (#7556)
1 parent ea2a4d5 commit c935dbf

File tree

11 files changed

+13
-10
lines changed

11 files changed

+13
-10
lines changed

pkg/agent/baker.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,6 +1507,7 @@ root = "{{GetDataDir}}"{{- end}}
15071507
type = "snapshot"
15081508
address = "/run/containerd/tardev-snapshotter.sock"
15091509
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-cc]
1510+
pod_annotations = ["io.katacontainers.*"]
15101511
snapshotter = "tardev"
15111512
runtime_type = "io.containerd.kata-cc.v2"
15121513
privileged_without_host_devices = true
@@ -1593,6 +1594,7 @@ root = "{{GetDataDir}}"{{- end}}
15931594
type = "snapshot"
15941595
address = "/run/containerd/tardev-snapshotter.sock"
15951596
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-cc]
1597+
pod_annotations = ["io.katacontainers.*"]
15961598
snapshotter = "tardev"
15971599
runtime_type = "io.containerd.kata-cc.v2"
15981600
privileged_without_host_devices = true
@@ -1735,6 +1737,7 @@ root = "{{GetDataDir}}"{{- end}}
17351737
type = "snapshot"
17361738
address = "/run/containerd/tardev-snapshotter.sock"
17371739
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-cc]
1740+
pod_annotations = ["io.katacontainers.*"]
17381741
snapshotter = "tardev"
17391742
runtime_type = "io.containerd.kata-cc.v2"
17401743
privileged_without_host_devices = true

pkg/agent/testdata/AzureLinuxV2+Kata/CSECommand

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AzureLinuxV3+Kata+DisableUnattendedUpgrades=false/CSECommand

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AzureLinuxV3+Kata+DisableUnattendedUpgrades=true/CSECommand

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AzureLinuxV3+Kata/CSECommand

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CSECommand

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CSECommand

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/CustomizedImageKata/CSECommand

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/MarinerV2+Kata/CSECommand

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CSECommand

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)