Add Uninstall Contour CRDs

tests/e2e/const.go

@@ -75,6 +75,7 @@ func apiGroupKoperatorDependencies() map[string]string {
 		"cert-manager": "cert-manager.io",
 		"zookeeper":    "zookeeper.pravega.io",
 		"prometheus":   "monitoring.coreos.com",
+		"contour":      "projectcontour.io",
 	}
 }
 

tests/e2e/test_uninstall.go

@@ -57,5 +57,10 @@ func testUninstall() bool {
 			ConfigPath:  kubectlOptions.ConfigPath,
 			Namespace:   certManagerHelmDescriptor.Namespace,
 		})
+		requireUninstallingContour(k8s.KubectlOptions{
+			ContextName: kubectlOptions.ContextName,
+			ConfigPath:  kubectlOptions.ConfigPath,
+			Namespace:   contourIngressControllerHelmDescriptor.Namespace,
+		})
 	})
 }

tests/e2e/types.go

@@ -24,6 +24,7 @@ type dependencyCRDsType struct {
 	zookeeper   []string
 	prometheus  []string
 	certManager []string
+	contour     []string
 }
 
 func (c *dependencyCRDsType) Zookeeper() []string {
@@ -35,13 +36,20 @@ func (c *dependencyCRDsType) Prometheus() []string {
 func (c *dependencyCRDsType) CertManager() []string {
 	return c.certManager
 }
+func (c *dependencyCRDsType) Contour() []string {
+	return c.contour
+}
 
 func (c *dependencyCRDsType) Initialize(kubectlOptions k8s.KubectlOptions) error {
 	var err error
 	c.certManager, err = listK8sResourceKinds(kubectlOptions, apiGroupKoperatorDependencies()["cert-manager"])
 	if err != nil {
 		return fmt.Errorf("initialize Cert-manager CRDs error: %w", err)
 	}
+	c.contour, err = listK8sResourceKinds(kubectlOptions, apiGroupKoperatorDependencies()["contour"])
+	if err != nil {
+		return fmt.Errorf("initialize Contour Ingress Controller CRDs error: %w", err)
+	}
 	c.prometheus, err = listK8sResourceKinds(kubectlOptions, apiGroupKoperatorDependencies()["prometheus"])
 	if err != nil {
 		return fmt.Errorf("initialize Prometheus CRDs error: %w", err)

tests/e2e/uninstall.go

@@ -206,6 +206,49 @@ func requireRemoveCertManagerCRDs(kubectlOptions k8s.KubectlOptions) {
 		}
 	})
 }
+func requireUninstallingContour(kubectlOptions k8s.KubectlOptions) {
+	When("Uninstalling zookeeper-operator", func() {
+		requireUninstallingContourHelmChart(kubectlOptions)
+		requireRemoveContourCRDs(kubectlOptions)
+		requireRemoveNamespace(kubectlOptions, contourIngressControllerHelmDescriptor.Namespace)
+	})
+}
+
+// requireUninstallingCertManagerHelmChart uninstalls cert-manager helm chart
+// and checks the success of that operation.
+func requireUninstallingContourHelmChart(kubectlOptions k8s.KubectlOptions) {
+	It("Uninstalling Project Contour Helm chart", func() {
+		err := contourIngressControllerHelmDescriptor.uninstallHelmChart(kubectlOptions, true)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Verifying Project Contour helm chart resources cleanup")
+
+		k8sResourceKinds, err := listK8sResourceKinds(kubectlOptions, "")
+		Expect(err).ShouldNot(HaveOccurred())
+
+		contourAvailableResourceKinds := stringSlicesInstersect(dependencyCRDs.Contour(), k8sResourceKinds)
+		contourAvailableResourceKinds = append(contourAvailableResourceKinds, basicK8sResourceKinds()...)
+
+		remainedResources, err := getK8sResources(kubectlOptions,
+			contourAvailableResourceKinds,
+			fmt.Sprintf(managedByHelmLabelTemplate, contourIngressControllerHelmDescriptor.ReleaseName),
+			"",
+			kubectlArgGoTemplateKindNameNamespace,
+			"--all-namespaces")
+		Expect(err).ShouldNot(HaveOccurred())
+
+		Expect(remainedResources).Should(BeEmpty())
+	})
+}
+
+func requireRemoveContourCRDs(kubectlOptions k8s.KubectlOptions) {
+	It("Removing Contour Ingress Controller CRDs", func() {
+		for _, crd := range dependencyCRDs.Contour() {
+			err := deleteK8sResourceNoErrNotFound(kubectlOptions, defaultDeletionTimeout, crdKind, crd)
+			Expect(err).ShouldNot(HaveOccurred())
+		}
+	})
+}
 
 // requireRemoveNamespace deletes the indicated namespace object
 func requireRemoveNamespace(kubectlOptions k8s.KubectlOptions, namespace string) {