Skip to content

Commit 2ab0e13

Browse files
committed
++ add tolerations to test
- Add tolerations to workload settings in cdi config. Signed-off-by: Ivan Mikheykin <[email protected]>
1 parent f9fc668 commit 2ab0e13

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

images/virtualization-artifact/pkg/builder/vm/option.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package vm
1818

1919
import (
20+
corev1 "k8s.io/api/core/v1"
2021
"k8s.io/apimachinery/pkg/api/resource"
2122

2223
"github.com/deckhouse/virtualization-controller/pkg/builder/meta"
@@ -94,6 +95,12 @@ func WithNodeSelector(nodeSelector map[string]string) Option {
9495
}
9596
}
9697

98+
func WithTolerations(tolerations []corev1.Toleration) Option {
99+
return func(vm *v1alpha2.VirtualMachine) {
100+
vm.Spec.Tolerations = tolerations
101+
}
102+
}
103+
97104
func WithLiveMigrationPolicy(liveMigrationPolicy v1alpha2.LiveMigrationPolicy) Option {
98105
return func(vm *v1alpha2.VirtualMachine) {
99106
vm.Spec.LiveMigrationPolicy = liveMigrationPolicy

templates/cdi/config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,3 +162,7 @@ spec:
162162
workload:
163163
nodeSelector:
164164
kubernetes.io/os: linux
165+
tolerations:
166+
- key: dedicated.deckhouse.io
167+
operator: Equal
168+
value: system

test/e2e/blockdevice/virtual_image_creation.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
25+
corev1 "k8s.io/api/core/v1"
2526
"sigs.k8s.io/controller-runtime/pkg/client"
2627

2728
cvibuilder "github.com/deckhouse/virtualization-controller/pkg/builder/cvi"
@@ -67,10 +68,17 @@ var _ = Describe("VirtualImageCreation", func() {
6768
)
6869
err := f.CreateWithDeferredDeletion(context.Background(), vd)
6970
Expect(err).NotTo(HaveOccurred())
70-
vm := object.NewMinimalVM("vm-", f.Namespace().Name, vmbuilder.WithBlockDeviceRefs(v1alpha2.BlockDeviceSpecRef{
71-
Kind: v1alpha2.VirtualDiskKind,
72-
Name: vd.Name,
73-
}))
71+
vm := object.NewMinimalVM("vm-", f.Namespace().Name,
72+
vmbuilder.WithBlockDeviceRefs(v1alpha2.BlockDeviceSpecRef{
73+
Kind: v1alpha2.VirtualDiskKind,
74+
Name: vd.Name,
75+
}),
76+
vmbuilder.WithTolerations([]corev1.Toleration{{
77+
Key: "dedicated.deckhouse.io",
78+
Operator: corev1.TolerationOpEqual,
79+
Value: "system",
80+
}}),
81+
)
7482
err = f.CreateWithDeferredDeletion(context.Background(), vm)
7583
Expect(err).NotTo(HaveOccurred())
7684
util.UntilObjectPhase(string(v1alpha2.DiskReady), framework.LongTimeout, vd)

0 commit comments

Comments
 (0)