Skip to content

Commit a5b259c

Browse files
beraldolealfidencio
authored andcommitted
Revert "values: simplify shim config using disableAll option"
This reverts commit 5da715f. disableAll doesn't work correctly with Helm overrides. The option causes RuntimeClass leaks when using Helm value overrides due to deep merge behavior. Reverting to explicit shim disables. Related: #52 Signed-off-by: Beraldo Leal <bleal@redhat.com>
1 parent c3cba7b commit a5b259c

File tree

4 files changed

+100
-8
lines changed

4 files changed

+100
-8
lines changed

values.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ kata-as-coco-runtime:
9191
setup: ["nydus"]
9292

9393
# TEE (Trusted Execution Environment) shims configuration
94-
# Only enable the shims we want to expose
94+
# Only enable the shims we want to expose, explicitly disable all others
9595
shims:
96-
disableAll: true
9796
# Enabled shims - TEE shims we want to expose
9897
qemu-snp:
9998
enabled: true
@@ -181,6 +180,25 @@ kata-as-coco-runtime:
181180
httpsProxy: ""
182181
noProxy: ""
183182

183+
# Kata runtimes that are not for TEE
184+
clh:
185+
enabled: false
186+
187+
cloud-hypervisor:
188+
enabled: false
189+
190+
dragonball:
191+
enabled: false
192+
193+
fc:
194+
enabled: false
195+
196+
qemu:
197+
enabled: false
198+
199+
qemu-runtime-rs:
200+
enabled: false
201+
184202
# RuntimeClasses configuration
185203
runtimeClasses:
186204
enabled: true

values/kata-alibabacloud-tdx.yaml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ kata-as-coco-runtime:
1616
setup: ["nydus"]
1717

1818
# TEE (Trusted Execution Environment) shims configuration
19-
# Only enable the shims we want to expose
19+
# Only enable the shims we want to expose, explicitly disable all others
2020
shims:
21-
disableAll: true
2221
qemu-tdx:
2322
enabled: true
2423
supportedArches:
@@ -46,6 +45,30 @@ kata-as-coco-runtime:
4645
httpsProxy: ""
4746
noProxy: ""
4847

48+
qemu-snp:
49+
enabled: false
50+
51+
qemu-coco-dev-runtime-rs:
52+
enabled: false
53+
54+
qemu-cca:
55+
enabled: false
56+
57+
qemu-se:
58+
enabled: false
59+
60+
qemu-se-runtime-rs:
61+
enabled: false
62+
63+
qemu-nvidia-gpu:
64+
enabled: false
65+
66+
qemu-nvidia-gpu-tdx:
67+
enabled: false
68+
69+
qemu-nvidia-gpu-snp:
70+
enabled: false
71+
4972
# RuntimeClasses configuration
5073
runtimeClasses:
5174
enabled: true

values/kata-remote.yaml

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,39 @@ kata-as-coco-runtime:
99
imagePullPolicy: Always
1010
k8sDistribution: k8s
1111

12-
# Disable all local shims - peer-pods uses the remote shim only
1312
shims:
14-
disableAll: true
13+
qemu-snp:
14+
enabled: false
15+
16+
qemu-tdx:
17+
enabled: false
18+
19+
qemu-se:
20+
enabled: false
21+
22+
qemu-se-runtime-rs:
23+
enabled: false
24+
25+
qemu-coco-dev:
26+
enabled: false
27+
28+
qemu-coco-dev-runtime-rs:
29+
enabled: false
30+
31+
clh:
32+
enabled: false
33+
34+
cloud-hypervisor:
35+
enabled: false
36+
37+
dragonball:
38+
enabled: false
39+
40+
fc:
41+
enabled: false
42+
43+
qemu:
44+
enabled: false
45+
46+
qemu-runtime-rs:
47+
enabled: false

values/kata-s390x.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ kata-as-coco-runtime:
1717
setup: ["nydus"]
1818

1919
# TEE (Trusted Execution Environment) shims configuration
20-
# Only enable the shims we want to expose
20+
# Only enable the shims we want to expose, explicitly disable all others
2121
shims:
22-
disableAll: true
2322
# Enabled shims - TEE shims we want to expose
2423
qemu-se:
2524
enabled: true
@@ -79,6 +78,25 @@ kata-as-coco-runtime:
7978
httpsProxy: ""
8079
noProxy: ""
8180

81+
# Kata runtimes that are not for TEE
82+
clh:
83+
enabled: false
84+
85+
cloud-hypervisor:
86+
enabled: false
87+
88+
dragonball:
89+
enabled: false
90+
91+
fc:
92+
enabled: false
93+
94+
qemu:
95+
enabled: false
96+
97+
qemu-runtime-rs:
98+
enabled: false
99+
82100
# RuntimeClasses configuration
83101
runtimeClasses:
84102
enabled: true

0 commit comments

Comments
 (0)