@@ -1165,22 +1165,22 @@ var _ = Describe("[rfe_id:28761][performance] Updating parameters in performance
1165
1165
})
1166
1166
1167
1167
When ("is not given" , func () {
1168
- It ("should run high-performance runtimes class with runc as container-runtime" , func () {
1168
+ It ("should run high-performance runtimes class with crun as container-runtime" , func () {
1169
1169
if ctrcfg != nil {
1170
- Skip ("runc is not the default runtime configuration" )
1170
+ Skip ("crun is not the default runtime configuration" )
1171
1171
}
1172
1172
cmd := []string {"cat" , "/rootfs/etc/crio/crio.conf.d/99-runtimes.conf" }
1173
1173
for i := 0 ; i < len (workerRTNodes ); i ++ {
1174
1174
output , err := nodes .ExecCommand (context .TODO (), & workerRTNodes [i ], cmd )
1175
1175
Expect (err ).ToNot (HaveOccurred (), "cannot get 99-runtimes.conf from %q" , workerRTNodes [i ].Name )
1176
1176
out := testutils .ToString (output )
1177
1177
By (fmt .Sprintf ("checking node: %q" , workerRTNodes [i ].Name ))
1178
- Expect (out ).To (ContainSubstring ("/bin/runc " ))
1179
- Expect (out ).To (ContainSubstring ("/run/runc " ))
1178
+ Expect (out ).To (ContainSubstring ("/bin/crun " ))
1179
+ Expect (out ).To (ContainSubstring ("/run/crun " ))
1180
1180
}
1181
1181
})
1182
1182
})
1183
- When ("updates the default runtime to crun " , func () {
1183
+ When ("updates the default runtime to runc " , func () {
1184
1184
It ("should run high-performance runtimes class with crun as container-runtime" , func () {
1185
1185
if ctrcfg == nil {
1186
1186
testlog .Infof ("ContainerRuntimeConfig not exist" )
@@ -1201,14 +1201,14 @@ var _ = Describe("[rfe_id:28761][performance] Updating parameters in performance
1201
1201
By (fmt .Sprintf ("waiting for mcp %q transition to UPDATED state" , performanceMCP ))
1202
1202
mcps .WaitForConditionFunc (performanceMCP , machineconfigv1 .MachineConfigPoolUpdated , corev1 .ConditionTrue , getMCPConditionStatus )
1203
1203
}
1204
- Expect (ctrcfg .Spec .ContainerRuntimeConfig .DefaultRuntime == machineconfigv1 .ContainerRuntimeDefaultRuntimeCrun ).To (BeTrue ())
1204
+ Expect (ctrcfg .Spec .ContainerRuntimeConfig .DefaultRuntime == machineconfigv1 .ContainerRuntimeDefaultRuntimeRunc ).To (BeTrue ())
1205
1205
cmd := []string {"cat" , "/rootfs/etc/crio/crio.conf.d/99-runtimes.conf" }
1206
1206
for i := 0 ; i < len (workerRTNodes ); i ++ {
1207
1207
out , err := nodes .ExecCommand (context .TODO (), & workerRTNodes [i ], cmd )
1208
1208
Expect (err ).ToNot (HaveOccurred (), "cannot get 99-runtimes.conf from %q" , workerRTNodes [i ].Name )
1209
1209
By (fmt .Sprintf ("checking node: %q" , workerRTNodes [i ].Name ))
1210
- Expect (out ).To (ContainSubstring ("/usr/ bin/crun " ))
1211
- Expect (out ).To (ContainSubstring ("/run/crun " ))
1210
+ Expect (out ).To (ContainSubstring ("/bin/runc " ))
1211
+ Expect (out ).To (ContainSubstring ("/run/runc " ))
1212
1212
}
1213
1213
})
1214
1214
})
@@ -1317,7 +1317,7 @@ func newContainerRuntimeConfig(name string, profile *performancev2.PerformancePr
1317
1317
MatchLabels : profilecomponent .GetMachineConfigPoolSelector (profile , profileMCP ),
1318
1318
},
1319
1319
ContainerRuntimeConfig : & machineconfigv1.ContainerRuntimeConfiguration {
1320
- DefaultRuntime : machineconfigv1 .ContainerRuntimeDefaultRuntimeCrun ,
1320
+ DefaultRuntime : machineconfigv1 .ContainerRuntimeDefaultRuntimeRunc ,
1321
1321
},
1322
1322
},
1323
1323
}
0 commit comments