test(api): refactor e2e label and annotation test case

Signed-off-by: Roman Sysoev <[email protected]>
deckhouse · Nov 11, 2024 · c292732 · c292732
1 parent c8f8a54
commit c292732
Show file tree

Hide file tree

Showing 17 changed files with 469 additions and 234 deletions.
diff --git a/tests/e2e/Taskfile.yaml b/tests/e2e/Taskfile.yaml
@@ -56,7 +56,6 @@ tasks:
       - |
         ginkgo \
           --skip-file vm_test.go \
-          --skip-file vm_label_annotation_test.go \
           --skip-file ipam_test.go \
           --skip-file disks_test.go \
           -v

diff --git a/tests/e2e/config/config.go b/tests/e2e/config/config.go
@@ -128,15 +128,16 @@ type Config struct {
 }
 
 type TestData struct {
-	ComplexTest      string `yaml:"complexTest"`
-	Connectivity     string `yaml:"connectivity"`
-	DiskResizing     string `yaml:"diskResizing"`
-	SizingPolicy     string `yaml:"sizingPolicy"`
-	VmConfiguration  string `yaml:"vmConfiguration"`
-	VmMigration      string `yaml:"vmMigration"`
-	VmDiskAttachment string `yaml:"vmDiskAttachment"`
-	Sshkey           string `yaml:"sshKey"`
-	SshUser          string `yaml:"sshUser"`
+	ComplexTest       string `yaml:"complexTest"`
+	Connectivity      string `yaml:"connectivity"`
+	DiskResizing      string `yaml:"diskResizing"`
+	SizingPolicy      string `yaml:"sizingPolicy"`
+	VmConfiguration   string `yaml:"vmConfiguration"`
+	VmLabelAnnotation string `yaml:"vmLabelAnnotation"`
+	VmMigration       string `yaml:"vmMigration"`
+	VmDiskAttachment  string `yaml:"vmDiskAttachment"`
+	Sshkey            string `yaml:"sshKey"`
+	SshUser           string `yaml:"sshUser"`
 }
 
 type StorageClass struct {

diff --git a/tests/e2e/default_config.yaml b/tests/e2e/default_config.yaml
@@ -24,6 +24,7 @@ testData:
   diskResizing: "/tmp/testdata/disk-resizing"
   sizingPolicy: "/tmp/testdata/sizing-policy"
   vmConfiguration: "/tmp/testdata/vm-configuration"
+  vmLabelAnnotation: "/tmp/testdata/vm-label-annotation"
   vmMigration: "/tmp/testdata/vm-migration"
   vmDiskAttachment: "/tmp/testdata/vm-disk-attachment"
   sshKey: "/tmp/testdata/sshkeys/id_ed"

diff --git a/tests/e2e/testdata/vm-label-annotation/base/cfg/cloudinit.yaml b/tests/e2e/testdata/vm-label-annotation/base/cfg/cloudinit.yaml
@@ -0,0 +1,12 @@
+#cloud-config
+users:
+  - name: cloud
+    # passwd: cloud
+    passwd: $6$rounds=4096$vln/.aPHBOI7BMYR$bBMkqQvuGs5Gyd/1H5DP4m9HjQSy.kgrxpaGEHwkX7KEFV8BS.HZWPitAtZ2Vd8ZqIZRqmlykRCagTgPejt1i.
+    shell: /bin/bash
+    sudo: ALL=(ALL) NOPASSWD:ALL
+    chpasswd: { expire: False }
+    lock_passwd: false
+    ssh_authorized_keys:
+      # testcases
+      - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxcXHmwaGnJ8scJaEN5RzklBPZpVSic4GdaAsKjQoeA [email protected]
diff --git a/tests/e2e/testdata/vm-label-annotation/base/kustomization.yaml b/tests/e2e/testdata/vm-label-annotation/base/kustomization.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./vm.yaml
+  - ./vd-root.yaml
+configurations:
+  - transformer.yaml
+generatorOptions:
+  disableNameSuffixHash: true
+secretGenerator:
+  - files:
+      - userData=cfg/cloudinit.yaml
+    name: cloud-init
+    type: provisioning.virtualization.deckhouse.io/cloud-init
diff --git a/tests/e2e/testdata/vm-label-annotation/base/transformer.yaml b/tests/e2e/testdata/vm-label-annotation/base/transformer.yaml
@@ -0,0 +1,54 @@
+# https://github.com/kubernetes-sigs/kustomize/blob/master/examples/transformerconfigs/README.md#transformer-configurations
+
+namespace:
+  - kind: ClusterVirtualImage
+    path: spec/dataSource/objectRef/namespace
+nameReference:
+  - kind: VirtualImage
+    version: v1alpha2 # optional
+    fieldSpecs:
+      - path: spec/dataSource/objectRef/name
+        kind: ClusterVirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualDisk
+      - path: spec/blockDeviceRefs/name
+        kind: VirtualMachine
+  - kind: ClusterVirtualImage
+    version: v1alpha2 # optional
+    fieldSpecs:
+      - path: spec/dataSource/objectRef/name
+        kind: ClusterVirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualDisk
+      - path: spec/blockDeviceRefs/name
+        kind: VirtualMachine
+  - kind: VirtualDisk
+    version: v1alpha2 # optional
+    fieldSpecs:
+      - path: spec/blockDeviceRefs/name
+        kind: VirtualMachine
+      - path: spec/blockDeviceRef/name
+        kind: VirtualMachineBlockDeviceAttachment
+  - kind: Secret
+    fieldSpecs:
+      - path: spec/provisioning/userDataRef/name
+        kind: VirtualMachine
+  - kind: VirtualMachineIPAddress
+    version: v1alpha2
+    fieldSpecs:
+      - path: spec/virtualMachineIPAddressName
+        kind: VirtualMachine
+  - kind: VirtualMachine
+    version: v1alpha2
+    fieldSpecs:
+      - path: spec/virtualMachineName
+        kind: VirtualMachineBlockDeviceAttachment
+  - kind: VirtualMachineClass
+    version: v1alpha2
+    fieldSpecs:
+      - path: spec/virtualMachineClassName
+        kind: VirtualMachine
diff --git a/tests/e2e/testdata/vm-label-annotation/base/vd-root.yaml b/tests/e2e/testdata/vm-label-annotation/base/vd-root.yaml
@@ -0,0 +1,12 @@
+apiVersion: virtualization.deckhouse.io/v1alpha2
+kind: VirtualDisk
+metadata:
+  name: vd-root
+spec:
+  persistentVolumeClaim:
+    size: 512Mi
+  dataSource:
+    type: ObjectRef
+    objectRef:
+      kind: VirtualImage
+      name: vi-alpine-http
diff --git a/tests/e2e/testdata/vm-label-annotation/base/vm.yaml b/tests/e2e/testdata/vm-label-annotation/base/vm.yaml
@@ -0,0 +1,21 @@
+apiVersion: virtualization.deckhouse.io/v1alpha2
+kind: VirtualMachine
+metadata:
+  name: vm
+spec:
+  virtualMachineClassName: generic
+  cpu:
+    cores: 1
+    coreFraction: 5%
+  memory:
+    size: 256Mi
+  disruptions:
+    restartApprovalMode: Manual
+  provisioning:
+    type: UserDataRef
+    userDataRef:
+      kind: Secret
+      name: cloud-init
+  blockDeviceRefs:
+    - kind: VirtualDisk
+      name: vd-root
diff --git a/tests/e2e/testdata/vm-label-annotation/kustomization.yaml b/tests/e2e/testdata/vm-label-annotation/kustomization.yaml
@@ -0,0 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: testcases
+namePrefix: pr-number-or-commit-hash-
+resources:
+  - ns.yaml
+  - vi
+  - overlays/vm-labal-annotation
+configurations:
+  - transformer.yaml
+labels:
+  - includeSelectors: true
+    pairs:
+      id: pr-number-or-commit-hash
+      testcase: vm-label-annotation
diff --git a/tests/e2e/testdata/vm-label-annotation/ns.yaml b/tests/e2e/testdata/vm-label-annotation/ns.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: default
diff --git a/tests/e2e/testdata/vm-label-annotation/overlays/vm-labal-annotation/kustomization.yaml b/tests/e2e/testdata/vm-label-annotation/overlays/vm-labal-annotation/kustomization.yaml
@@ -0,0 +1,20 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+nameSuffix: -label-annotation
+resources:
+  - ../../base
+patches:
+  - patch: |-
+      - op: replace
+        path: /spec/runPolicy
+        value: AlwaysOn
+    target:
+      kind: VirtualMachine
+      name: vm
+  - patch: |-
+      - op: replace
+        path: /spec/disruptions/restartApprovalMode
+        value: Automatic
+    target:
+      kind: VirtualMachine
+      name: vm
diff --git a/tests/e2e/testdata/vm-label-annotation/transformer.yaml b/tests/e2e/testdata/vm-label-annotation/transformer.yaml
@@ -0,0 +1,52 @@
+namespace:
+  - kind: ClusterVirtualImage
+    path: spec/dataSource/objectRef/namespace
+nameReference:
+  - kind: VirtualImage
+    version: v1alpha2 # optional
+    fieldSpecs:
+      - path: spec/dataSource/objectRef/name
+        kind: ClusterVirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualDisk
+      - path: spec/blockDeviceRefs/name
+        kind: VirtualMachine
+  - kind: ClusterVirtualImage
+    version: v1alpha2 # optional
+    fieldSpecs:
+      - path: spec/dataSource/objectRef/name
+        kind: ClusterVirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualImage
+      - path: spec/dataSource/objectRef/name
+        kind: VirtualDisk
+      - path: spec/blockDeviceRefs/name
+        kind: VirtualMachine
+  - kind: VirtualDisk
+    version: v1alpha2 # optional
+    fieldSpecs:
+      - path: spec/blockDeviceRefs/name
+        kind: VirtualMachine
+      - path: spec/blockDeviceRef/name
+        kind: VirtualMachineBlockDeviceAttachment
+  - kind: Secret
+    fieldSpecs:
+      - path: spec/provisioning/userDataRef/name
+        kind: VirtualMachine
+  - kind: VirtualMachineIPAddress
+    version: v1alpha2
+    fieldSpecs:
+      - path: spec/virtualMachineIPAddressName
+        kind: VirtualMachine
+  - kind: VirtualMachine
+    version: v1alpha2
+    fieldSpecs:
+      - path: spec/virtualMachineName
+        kind: VirtualMachineBlockDeviceAttachment
+  - kind: VirtualMachineClass
+    version: v1alpha2
+    fieldSpecs:
+      - path: spec/virtualMachineClassName
+        kind: VirtualMachine
diff --git a/tests/e2e/testdata/vm-label-annotation/vi/kustomization.yaml b/tests/e2e/testdata/vm-label-annotation/vi/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - vi-alpine-http.yaml
diff --git a/tests/e2e/testdata/vm-label-annotation/vi/vi-alpine-http.yaml b/tests/e2e/testdata/vm-label-annotation/vi/vi-alpine-http.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: virtualization.deckhouse.io/v1alpha2
+kind: VirtualImage
+metadata:
+  name: vi-alpine-http
+spec:
+  storage: ContainerRegistry
+  dataSource:
+    type: HTTP
+    http:
+      url: https://0e773854-6b4e-4e76-a65b-d9d81675451a.selstorage.ru/alpine/alpine-v3-20.qcow2
diff --git a/tests/e2e/testdata/vm/vm_label_annotation.yaml b/tests/e2e/testdata/vm/vm_label_annotation.yaml
diff --git a/tests/e2e/tests_suite_test.go b/tests/e2e/tests_suite_test.go
@@ -96,6 +96,7 @@ func init() {
 		fmt.Sprintf("%s/%s", conf.TestData.DiskResizing, "kustomization.yaml"),
 		fmt.Sprintf("%s/%s", conf.TestData.SizingPolicy, "kustomization.yaml"),
 		fmt.Sprintf("%s/%s", conf.TestData.VmConfiguration, "kustomization.yaml"),
+		fmt.Sprintf("%s/%s", conf.TestData.VmLabelAnnotation, "kustomization.yaml"),
 		fmt.Sprintf("%s/%s", conf.TestData.VmMigration, "kustomization.yaml"),
 		fmt.Sprintf("%s/%s", conf.TestData.VmDiskAttachment, "kustomization.yaml"),
 	}