Fix Contour e2e (#91)

Author: dvaseekara

.github/actions/kind-create/action.yaml

@@ -45,3 +45,12 @@ runs:
       chmod 600 $kubeconfig_path
       echo "kubeconfig=$(echo $kubeconfig_path)" >> $GITHUB_OUTPUT
     shell: bash
+  
+  - name: Install cloud-provider-kind
+    id: cloud-provider-kind
+    run: |
+      echo "Install cloud-provider-kind"
+      go install sigs.k8s.io/cloud-provider-kind@latest
+      kubectl label node e2e-kind-control-plane node.kubernetes.io/exclude-from-external-load-balancers- 
+      ~/go/bin/cloud-provider-kind &
+    shell: bash

.github/workflows/e2e-test.yaml

@@ -18,6 +18,12 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: 1.21
+          
+      # Enable Tmate Session if you'd like to Debut the E2E Kind Cluster
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
+      #   with:
+      #     detached: true
 
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/helm.yml

@@ -33,7 +33,6 @@ jobs:
 
       - name: Add Helm repositories
         run: |
-          helm repo add banzaicloud-stable "https://kubernetes-charts.banzaicloud.com"
           helm repo add incubator "https://charts.helm.sh/incubator"
           helm repo add stable "https://charts.helm.sh/stable"
 

charts/kafka-operator/templates/operator-rbac.yaml

@@ -44,6 +44,12 @@ rules:
   - '*'
   verbs:
   - '*'
+- apiGroups:
+  - projectcontour.io
+  resources:
+  - '*'
+  verbs:
+  - '*'
 - apiGroups:
   - ""
   resources:

charts/kafka-operator/values.yaml

@@ -23,7 +23,7 @@ operator:
   # When this field is not empty and Cert-manager is used,
   # the Cert-manager's Custom Resource Namespace must be included in the comma separated list.
   # When it is empty, all namespaces will be watched.
-  namespaces: ""
+  namespaces: "kafka, cert-manager"
   verboseLogging: false
   developmentLogging: false
   resources:

config/samples/simplekafkacluster_ssl.yaml

@@ -58,7 +58,7 @@ spec:
         # sslClientAuth defaults to be "required" for two-way SSL authentication, possible values are: "required", "requested", and "none"
         # sslClientAuth: "requested"
     sslSecrets:
-      tlsSecretName: "kafka-ca-certs"
+      tlsSecretName: "kafka-ca-certificate"
       create: true
   cruiseControlConfig:
     # podSecurityContext:

tests/e2e/const.go

@@ -40,7 +40,7 @@ const (
 	testExternalTopicName = "topic-test-external"
 	testInternalTopicName = "topic-test-internal"
 
-	defaultTLSSecretName       = "test-secret"
+	defaultTLSSecretName       = "kafka-ca-certificate"
 	kcatName                   = "kcat"
 	zookeeperKind              = "zookeeperclusters.zookeeper.pravega.io"
 	zookeeperClusterName       = "zookeeper-server"
@@ -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) {