fix: e2e workflows

Signed-off-by: will <[email protected]>

Author: wcrum

.github/workflows/test-chart.yml

@@ -49,6 +49,22 @@ jobs:
       - name: Update Helm chart dependencies
         run: helm dependency update ./dist/chart
 
+      - name: Install cert-manager
+        run: |
+          helm repo add jetstack https://charts.jetstack.io
+          helm repo update
+          helm install cert-manager jetstack/cert-manager \
+            --namespace cert-manager \
+            --create-namespace \
+            --version v1.16.3 \
+            --set crds.enabled=true
+
+      - name: Wait for cert-manager to be ready
+        run: |
+          kubectl wait --namespace cert-manager --for=condition=available --timeout=300s deployment/cert-manager
+          kubectl wait --namespace cert-manager --for=condition=available --timeout=300s deployment/cert-manager-cainjector
+          kubectl wait --namespace cert-manager --for=condition=available --timeout=300s deployment/cert-manager-webhook
+
 # TODO: Uncomment if Prometheus is enabled
 #      - name: Install Prometheus Operator CRDs
 #        run: |
@@ -68,19 +84,13 @@ jobs:
 
       - name: Install Helm chart for project
         run: |
-          helm install my-release ./dist/chart --create-namespace --namespace imageshift-v2-system --set certmanager.install=true
-
-      - name: Wait for cert-manager to be ready
-        run: |
-          kubectl wait --namespace cert-manager --for=condition=available --timeout=300s deployment/cert-manager
-          kubectl wait --namespace cert-manager --for=condition=available --timeout=300s deployment/cert-manager-cainjector
-          kubectl wait --namespace cert-manager --for=condition=available --timeout=300s deployment/cert-manager-webhook
+          helm install my-release ./dist/chart --create-namespace --namespace imageshift --set certmanager.install=false
 
       - name: Check Helm release status
         run: |
-          helm status my-release --namespace imageshift-v2-system
+          helm status my-release --namespace imageshift
 
 # TODO: Uncomment if prometheus.enabled is set to true to confirm that the ServiceMonitor gets created
 #      - name: Check Presence of ServiceMonitor
 #        run: |
-#          kubectl wait --namespace imageshift-v2-system --for=jsonpath='{.kind}'=ServiceMonitor servicemonitor/imageshift-v2-controller-manager-metrics-monitor
+#          kubectl wait --namespace imageshift --for=jsonpath='{.kind}'=ServiceMonitor servicemonitor/imageshift-v2-controller-manager-metrics-monitor

test/e2e/e2e_test.go

@@ -31,7 +31,7 @@ import (
 )
 
 // namespace where the project is deployed in
-const namespace = "imageshift-v2-system"
+const namespace = "imageshift"
 
 // serviceAccountName created for the project
 const serviceAccountName = "imageshift-v2-controller-manager"