operator tests: re-install testing manifests on update

When testing update by updating virt-operator, the virt-operator manifest gets removed from the cluster.
However, the virt-operator manifest includes the kubevirt namespace, so all resources in the namespace get removed.
Testing manifests are part of that, and so they need to be reinstalled or subsequent tests might fail.

Signed-off-by: Jed Lejosne <[email protected]>
(cherry picked from commit 0ec2c45)
Signed-off-by: Jed Lejosne <[email protected]>

hack/common.sh

@@ -48,6 +48,7 @@ ARCHITECTURE="${BUILD_ARCH:-$(uname -m)}"
 HOST_ARCHITECTURE="$(uname -m)"
 KUBEVIRT_NO_BAZEL=${KUBEVIRT_NO_BAZEL:-false}
 OPERATOR_MANIFEST_PATH=$MANIFESTS_OUT_DIR/release/kubevirt-operator.yaml
+TESTING_MANIFEST_PATH=$MANIFESTS_OUT_DIR/testing
 KUBEVIRT_CRI="$(determine_cri_bin)"
 
 function build_func_tests() {

hack/functests.sh

@@ -61,7 +61,7 @@ function functest() {
         KUBEVIRT_FUNC_TEST_SUITE_ARGS="-skip-dual-stack-test ${KUBEVIRT_FUNC_TEST_SUITE_ARGS}"
     fi
 
-    _out/tests/ginkgo -timeout=3h -r -slow-spec-threshold=60s $@ _out/tests/tests.test -- -kubeconfig=${kubeconfig} -container-tag=${docker_tag} -container-tag-alt=${docker_tag_alt} -container-prefix=${functest_docker_prefix} -image-prefix-alt=${image_prefix_alt} -oc-path=${oc} -kubectl-path=${kubectl} -gocli-path=${gocli} -installed-namespace=${namespace} -previous-release-tag=${PREVIOUS_RELEASE_TAG} -previous-release-registry=${previous_release_registry} -deploy-testing-infra=${deploy_testing_infra} -config=${kubevirt_test_config} --artifacts=${ARTIFACTS} --operator-manifest-path=${OPERATOR_MANIFEST_PATH} ${KUBEVIRT_FUNC_TEST_SUITE_ARGS}
+    _out/tests/ginkgo -timeout=3h -r -slow-spec-threshold=60s $@ _out/tests/tests.test -- -kubeconfig=${kubeconfig} -container-tag=${docker_tag} -container-tag-alt=${docker_tag_alt} -container-prefix=${functest_docker_prefix} -image-prefix-alt=${image_prefix_alt} -oc-path=${oc} -kubectl-path=${kubectl} -gocli-path=${gocli} -installed-namespace=${namespace} -previous-release-tag=${PREVIOUS_RELEASE_TAG} -previous-release-registry=${previous_release_registry} -deploy-testing-infra=${deploy_testing_infra} -config=${kubevirt_test_config} --artifacts=${ARTIFACTS} --operator-manifest-path=${OPERATOR_MANIFEST_PATH} --testing-manifest-path=${TESTING_MANIFEST_PATH} ${KUBEVIRT_FUNC_TEST_SUITE_ARGS}
 }
 
 if [ "$KUBEVIRT_E2E_PARALLEL" == "true" ]; then

tests/flags/flags.go

@@ -50,6 +50,7 @@ var IPV6ConnectivityCheckAddress = ""
 var ConnectivityCheckDNS = ""
 var ArtifactsDir string
 var OperatorManifestPath string
+var TestingManifestPath string
 var ApplyDefaulte2eConfiguration bool
 
 var DeployTestingInfrastructureFlag = false
@@ -82,6 +83,7 @@ func init() {
 	flag.StringVar(&ConfigFile, "config", "tests/default-config.json", "Path to a JSON formatted file from which the test suite will load its configuration. The path may be absolute or relative; relative paths start at the current working directory.")
 	flag.StringVar(&ArtifactsDir, "artifacts", os.Getenv("ARTIFACTS"), "Directory for storing reporter artifacts like junit files or logs")
 	flag.StringVar(&OperatorManifestPath, "operator-manifest-path", "", "Set path to virt-operator manifest file")
+	flag.StringVar(&TestingManifestPath, "testing-manifest-path", "", "Set path to testing manifests directory")
 	flag.BoolVar(&SkipShasumCheck, "skip-shasums-check", false, "Skip tests with sha sums.")
 	flag.BoolVar(&SkipDualStackTests, "skip-dual-stack-test", false, "Skip test that actively checks for the presence of IPv6 address in the cluster pods.")
 	flag.StringVar(&IPV4ConnectivityCheckAddress, "conn-check-ipv4-address", "", "Address that is used for testing IPV4 connectivity to the outside world")

tests/operator_test.go

@@ -133,7 +133,9 @@ var _ = Describe("[Serial][sig-operator]Operator", func() {
 		parseOperatorImage                     func() (*v12.Deployment, string, string, string, string)
 		patchOperator                          func(*string, *string) bool
 		installOperator                        func(string)
+		installTestingManifests                func(string)
 		deleteOperator                         func(string)
+		deleteTestingManifests                 func(string)
 		deleteAllKvAndWait                     func(bool)
 		usesSha                                func(string) bool
 		ensureShasums                          func()
@@ -615,11 +617,21 @@ var _ = Describe("[Serial][sig-operator]Operator", func() {
 			}, 60*time.Second, 1*time.Second).ShouldNot(HaveOccurred())
 		}
 
+		installTestingManifests = func(manifestPath string) {
+			_, _, err = clientcmd.RunCommandWithNS(metav1.NamespaceNone, k8sClient, "apply", "-f", manifestPath)
+			Expect(err).ToNot(HaveOccurred())
+		}
+
 		deleteOperator = func(manifestPath string) {
 			_, _, err = clientcmd.RunCommandWithNS(metav1.NamespaceNone, k8sClient, "delete", "-f", manifestPath)
 			Expect(err).ToNot(HaveOccurred())
 		}
 
+		deleteTestingManifests = func(manifestPath string) {
+			_, _, err = clientcmd.RunCommandWithNS(metav1.NamespaceNone, k8sClient, "delete", "-f", manifestPath)
+			Expect(err).ToNot(HaveOccurred())
+		}
+
 		deleteAllKvAndWait = func(ignoreOriginal bool) {
 			Eventually(func() error {
 
@@ -1086,6 +1098,9 @@ spec:
 
 		// ensure that the state is fully restored after destructive tests
 		verifyOperatorWebhookCertificate()
+
+		_, err = virtClient.AppsV1().DaemonSets(flags.KubeVirtInstallNamespace).Get(context.Background(), "disks-images-provider", metav1.GetOptions{})
+		Expect(err).ToNot(HaveOccurred(), "")
 	})
 
 	It("[test_id:1746]should have created and available condition", func() {
@@ -1500,6 +1515,9 @@ spec:
 			sanityCheckDeploymentsDeleted()
 
 			if updateOperator {
+				By("Deleting testing manifests")
+				deleteTestingManifests(flags.TestingManifestPath)
+
 				By("Deleting virt-operator installation")
 				deleteOperator(flags.OperatorManifestPath)
 
@@ -1595,6 +1613,9 @@ spec:
 			if updateOperator {
 				By("Updating virt-operator installation")
 				installOperator(flags.OperatorManifestPath)
+
+				By("Re-installing testing manifests")
+				installTestingManifests(flags.TestingManifestPath)
 			} else {
 				By("Updating KubeVirt object With current tag")
 				patchKvVersionAndRegistry(kv.Name, curVersion, curRegistry)