Support Windows E2E.

* Please notice only Kibishii workload support Windows test,
because the other work loads use busybox image, and not support Windows.
* Refactor CreateFileToPod to support Windows.
* Add skip logic for migration test if the version is under 1.16.
* Add main in semver check.

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>

Author: blackpiglet

hack/build-image/Dockerfile

@@ -34,7 +34,7 @@ RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.5
 
 # get goimports (the revision is pinned so we don't indiscriminately update, but the particular commit
 # is not important)
-RUN go install golang.org/x/tools/cmd/goimports@11e9d9cc0042e6bd10337d4d2c3e5d9295508e7d
+RUN go install golang.org/x/tools/cmd/goimports@v0.33.0
 
 # get protoc compiler and golang plugin
 WORKDIR /root

test/Makefile

@@ -119,6 +119,8 @@ VELERO_SERVER_DEBUG_MODE ?= false
 
 ITEM_BLOCK_WORKER_COUNT ?= 1
 
+WORKER_OS ?= linux
+
 # Parameters to run migration tests along with all other E2E tests, and both of them should
 #   be provided or left them all empty to skip migration tests with no influence to other
 #   E2E tests.
@@ -221,7 +223,8 @@ run-e2e: ginkgo
 		--standby-cls-service-account-name=$(STANDBY_CLS_SERVICE_ACCOUNT_NAME) \
 		--kibishii-directory=$(KIBISHII_DIRECTORY) \
 		--disable-informer-cache=$(DISABLE_INFORMER_CACHE) \
-		--image-registry-proxy=$(IMAGE_REGISTRY_PROXY)
+		--image-registry-proxy=$(IMAGE_REGISTRY_PROXY) \
+		--worker-os=$(WORKER_OS)
 
 .PHONY: run-perf
 run-perf: ginkgo

test/e2e/README.md

@@ -79,6 +79,7 @@ These configuration parameters are expected as values to the following command l
 1. `--debug-velero-pod-restart`: A switch for debugging velero pod restart.
 1. `--fail-fast`: A switch for for failing fast on meeting error.
 1. `--has-vsphere-plugin`: A switch to indicate whether the Velero vSphere plugin is installed for vSphere environment.
+1. `--worker-os`: A switch to indicate the workload should be ran on windows or linux OS.
 
 These configurations or parameters are used to generate install options for Velero for each test suite.
 
@@ -131,6 +132,7 @@ Below is a mapping between `make` variables to E2E configuration flags.
 1. `DEBUG_VELERO_POD_RESTART`: `-debug-velero-pod-restart`. Optional.
 1. `FAIL_FAST`: `--fail-fast`. Optional.
 1. `HAS_VSPHERE_PLUGIN`: `--has-vsphere-plugin`. Optional.
+1. `WORKER_OS`: `--worker-os`. Optional.
 
 
 

test/e2e/backup/backup.go

@@ -140,7 +140,15 @@ func BackupRestoreTest(backupRestoreTestConfig BackupRestoreTestConfig) {
 			veleroCfg.ProvideSnapshotsVolumeParam = provideSnapshotVolumesParmInBackup
 
 			// Set DefaultVolumesToFsBackup to false since DefaultVolumesToFsBackup was set to true during installation
-			Expect(RunKibishiiTests(veleroCfg, backupName, restoreName, "", kibishiiNamespace, useVolumeSnapshots, false)).To(Succeed(),
+			Expect(RunKibishiiTests(
+				veleroCfg,
+				backupName,
+				restoreName,
+				"",
+				kibishiiNamespace,
+				useVolumeSnapshots,
+				false,
+			)).To(Succeed(),
 				"Failed to successfully backup and restore Kibishii namespace")
 		})
 
@@ -212,7 +220,17 @@ func BackupRestoreTest(backupRestoreTestConfig BackupRestoreTestConfig) {
 				}
 				veleroCfg.ProvideSnapshotsVolumeParam = !provideSnapshotVolumesParmInBackup
 				workloadNS := kibishiiNamespace + bsl
-				Expect(RunKibishiiTests(veleroCfg, backupName, restoreName, bsl, workloadNS, useVolumeSnapshots, !useVolumeSnapshots)).To(Succeed(),
+				Expect(
+					RunKibishiiTests(
+						veleroCfg,
+						backupName,
+						restoreName,
+						bsl,
+						workloadNS,
+						useVolumeSnapshots,
+						!useVolumeSnapshots,
+					),
+				).To(Succeed(),
 					"Failed to successfully backup and restore Kibishii namespace using BSL %s", bsl)
 			}
 		})

test/e2e/backups/deletion.go

@@ -125,6 +125,7 @@ func runBackupDeletionTests(client TestClient, veleroCfg VeleroConfig, backupLoc
 			kibishiiDirectory,
 			DefaultKibishiiData,
 			veleroCfg.ImageRegistryProxy,
+			veleroCfg.WorkerOS,
 		); err != nil {
 			return errors.Wrapf(err, "Failed to install and prepare data for kibishii %s", ns)
 		}

test/e2e/backups/ttl.go

@@ -110,6 +110,7 @@ func TTLTest() {
 				veleroCfg.KibishiiDirectory,
 				DefaultKibishiiData,
 				veleroCfg.ImageRegistryProxy,
+				veleroCfg.WorkerOS,
 			)).To(Succeed())
 		})
 

test/e2e/basic/backup-volume-info/base.go

@@ -138,8 +138,16 @@ func (v *BackupVolumeInfo) CreateResources() error {
 				// Hitting issue https://github.com/vmware-tanzu/velero/issues/7388
 				// So populate data only to some of pods, leave other pods empty to verify empty PV datamover
 				if i%2 == 0 {
-					Expect(CreateFileToPod(v.Ctx, createNSName, pod.Name, DefaultContainerName, vols[i].Name,
-						fmt.Sprintf("file-%s", pod.Name), CreateFileContent(createNSName, pod.Name, vols[i].Name))).To(Succeed())
+					Expect(CreateFileToPod(
+						v.Ctx,
+						createNSName,
+						pod.Name,
+						DefaultContainerName,
+						vols[i].Name,
+						fmt.Sprintf("file-%s", pod.Name),
+						CreateFileContent(createNSName, pod.Name, vols[i].Name),
+						WorkerOSLinux,
+					)).To(Succeed())
 				}
 			}
 		}

test/e2e/basic/namespace-mapping.go

@@ -101,6 +101,7 @@ func (n *NamespaceMapping) CreateResources() error {
 				n.VeleroCfg.KibishiiDirectory,
 				n.kibishiiData,
 				n.VeleroCfg.ImageRegistryProxy,
+				n.VeleroCfg.WorkerOS,
 			)).To(Succeed())
 		})
 	}
@@ -111,8 +112,14 @@ func (n *NamespaceMapping) Verify() error {
 	for index, ns := range n.MappedNamespaceList {
 		n.kibishiiData.Levels = len(*n.NSIncluded) + index
 		By(fmt.Sprintf("Verify workload %s after restore ", ns), func() {
-			Expect(KibishiiVerifyAfterRestore(n.Client, ns,
-				n.Ctx, n.kibishiiData, "")).To(Succeed(), "Fail to verify workload after restore")
+			Expect(KibishiiVerifyAfterRestore(
+				n.Client,
+				ns,
+				n.Ctx,
+				n.kibishiiData,
+				"",
+				n.VeleroCfg.WorkerOS,
+			)).To(Succeed(), "Fail to verify workload after restore")
 		})
 	}
 	for _, ns := range *n.NSIncluded {

test/e2e/bsl-mgmt/deletion.go

@@ -162,6 +162,7 @@ func BslDeletionTest(useVolumeSnapshots bool) {
 					veleroCfg.KibishiiDirectory,
 					DefaultKibishiiData,
 					veleroCfg.ImageRegistryProxy,
+					veleroCfg.WorkerOS,
 				)).To(Succeed())
 			})
 

test/e2e/e2e_suite_test.go

@@ -356,6 +356,12 @@ func init() {
 		"",
 		"The image registry proxy, e.g. when the DockerHub access limitation is reached, can use available proxy to replace. Default is nil.",
 	)
+	flag.StringVar(
+		&test.VeleroCfg.WorkerOS,
+		"worker-os",
+		"linux",
+		"test k8s worker node OS version, should be either linux or windows.",
+	)
 }
 
 // Add label [SkipVanillaZfs]:
@@ -621,12 +627,12 @@ var _ = Describe(
 
 var _ = Describe(
 	"Backup resources should follow the specific order in schedule",
-	Label("PVBackup", "OptIn"),
+	Label("PVBackup", "OptIn", "Restic"),
 	OptInPVBackupTest,
 )
 var _ = Describe(
 	"Backup resources should follow the specific order in schedule",
-	Label("PVBackup", "OptOut"),
+	Label("PVBackup", "OptOut", "Restic"),
 	OptOutPVBackupTest,
 )