Skip to content

Commit 877e5e4

Browse files
BickorBickor
authored
Updated kata containerd config. (#6816)
1 parent 46f0ec6 commit 877e5e4

11 files changed

Lines changed: 27 additions & 65 deletions

File tree

‎pkg/agent/baker.go‎

Lines changed: 17 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,18 +1504,9 @@ root = "{{GetDataDir}}"{{- end}}
15041504
{{- if IsKata }}
15051505
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata]
15061506
runtime_type = "io.containerd.kata.v2"
1507-
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.katacli]
1508-
runtime_type = "io.containerd.runc.v1"
1509-
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.katacli.options]
1510-
NoPivotRoot = false
1511-
NoNewKeyring = false
1512-
ShimCgroup = ""
1513-
IoUid = 0
1514-
IoGid = 0
1515-
BinaryName = "/usr/bin/kata-runtime"
1516-
Root = ""
1517-
CriuPath = ""
1518-
SystemdCgroup = false
1507+
privileged_without_host_devices = true
1508+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata.options]
1509+
ConfigPath = "/usr/share/defaults/kata-containers/configuration.toml"
15191510
[proxy_plugins]
15201511
[proxy_plugins.tardev]
15211512
type = "snapshot"
@@ -1524,7 +1515,6 @@ root = "{{GetDataDir}}"{{- end}}
15241515
snapshotter = "tardev"
15251516
runtime_type = "io.containerd.kata-cc.v2"
15261517
privileged_without_host_devices = true
1527-
pod_annotations = ["io.katacontainers.*"]
15281518
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-cc.options]
15291519
ConfigPath = "/opt/confidential-containers/share/defaults/kata-containers/configuration-clh-snp.toml"
15301520
{{- end}}
@@ -1598,30 +1588,20 @@ root = "{{GetDataDir}}"{{- end}}
15981588
address = "/run/overlaybd-snapshotter/overlaybd.sock"
15991589
{{- end}}
16001590
{{- if IsKata }}
1601-
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata]
1591+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata]
16021592
runtime_type = "io.containerd.kata.v2"
1603-
snapshotter = "tardev"
1604-
disable_snapshot_annotations = false
1605-
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.katacli]
1606-
runtime_type = "io.containerd.runc.v1"
1607-
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.katacli.options]
1608-
NoPivotRoot = false
1609-
NoNewKeyring = false
1610-
ShimCgroup = ""
1611-
IoUid = 0
1612-
IoGid = 0
1613-
BinaryName = "/usr/bin/kata-runtime"
1614-
Root = ""
1615-
SystemdCgroup = false
1593+
privileged_without_host_devices = true
1594+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata.options]
1595+
ConfigPath = "/usr/share/defaults/kata-containers/configuration.toml"
16161596
[proxy_plugins]
16171597
[proxy_plugins.tardev]
16181598
type = "snapshot"
16191599
address = "/run/containerd/tardev-snapshotter.sock"
1620-
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata-cc]
1600+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-cc]
1601+
snapshotter = "tardev"
16211602
runtime_type = "io.containerd.kata-cc.v2"
16221603
privileged_without_host_devices = true
1623-
pod_annotations = ["io.katacontainers.*"]
1624-
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata-cc.options]
1604+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-cc.options]
16251605
ConfigPath = "/opt/confidential-containers/share/defaults/kata-containers/configuration-clh-snp.toml"
16261606
{{- end}}
16271607
`
@@ -1682,19 +1662,11 @@ root = "{{GetDataDir}}"{{- end}}
16821662
address = "/run/overlaybd-snapshotter/overlaybd.sock"
16831663
{{- end}}
16841664
{{- if IsKata }}
1685-
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.kata]
1665+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata]
16861666
runtime_type = "io.containerd.kata.v2"
1687-
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.katacli]
1688-
runtime_type = "io.containerd.runc.v1"
1689-
[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.katacli.options]
1690-
NoPivotRoot = false
1691-
NoNewKeyring = false
1692-
ShimCgroup = ""
1693-
IoUid = 0
1694-
IoGid = 0
1695-
BinaryName = "/usr/bin/kata-runtime"
1696-
Root = ""
1697-
SystemdCgroup = false
1667+
privileged_without_host_devices = true
1668+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata.options]
1669+
ConfigPath = "/usr/share/defaults/kata-containers/configuration.toml"
16981670
[proxy_plugins]
16991671
[proxy_plugins.tardev]
17001672
type = "snapshot"
@@ -1760,18 +1732,9 @@ root = "{{GetDataDir}}"{{- end}}
17601732
{{- if IsKata }}
17611733
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata]
17621734
runtime_type = "io.containerd.kata.v2"
1763-
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.katacli]
1764-
runtime_type = "io.containerd.runc.v1"
1765-
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.katacli.options]
1766-
NoPivotRoot = false
1767-
NoNewKeyring = false
1768-
ShimCgroup = ""
1769-
IoUid = 0
1770-
IoGid = 0
1771-
BinaryName = "/usr/bin/kata-runtime"
1772-
Root = ""
1773-
CriuPath = ""
1774-
SystemdCgroup = false
1735+
privileged_without_host_devices = true
1736+
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata.options]
1737+
ConfigPath = "/usr/share/defaults/kata-containers/configuration.toml"
17751738
[proxy_plugins]
17761739
[proxy_plugins.tardev]
17771740
type = "snapshot"
@@ -1780,7 +1743,6 @@ root = "{{GetDataDir}}"{{- end}}
17801743
snapshotter = "tardev"
17811744
runtime_type = "io.containerd.kata-cc.v2"
17821745
privileged_without_host_devices = true
1783-
pod_annotations = ["io.katacontainers.*"]
17841746
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata-cc.options]
17851747
ConfigPath = "/opt/confidential-containers/share/defaults/kata-containers/configuration-clh-snp.toml"
17861748
{{- end}}

0 commit comments

Comments
 (0)