Add end-to-end chart test

Author: Starefossen

.github/workflows/chart.yaml

@@ -153,10 +153,12 @@ jobs:
         if: steps.list-changed.outputs.changed == 'true'
         run: |
           helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+          helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo update
           helm install prometheus-operator-crds  prometheus-community/prometheus-operator-crds --wait
+          helm install postgresql bitnami/postgresql --wait
           helm install unleasherator-crds ./charts/unleasherator-crds --wait
-          ct install --charts ./charts/unleasherator --target-branch ${{ github.event.repository.default_branch }}
+          ct install --charts ./charts/unleasherator --target-branch ${{ github.event.repository.default_branch }}  --helm-extra-args '--timeout 400s'
 
   push:
     permissions:

charts/unleasherator/templates/tests/test-unleash-v5.yaml

@@ -0,0 +1,64 @@
+---
+apiVersion: unleash.nais.io/v1
+kind: Unleash
+metadata:
+  name: unleash-connection-test
+  namespace: default
+  labels:
+    app.kubernetes.io/name: unleash-connection-test
+    app.kubernetes.io/part-of: unleasherator
+spec:
+  size: 1
+  customImage: unleashorg/unleash-server:5
+  database:
+    secretName: postgres-postgresql
+    secretPassKey: postgres-password
+    host: postgres-postgresql
+    databaseName: postgres
+    port: "5432"
+    user: postgres
+    ssl: "false"
+  extraEnvVars:
+    - name: ENABLE_OAS
+      value: "true"
+  networkPolicy:
+    enabled: true
+    allowDNS: true
+    extraEgressRules:
+      - to:
+          - podSelector:
+              matchLabels:
+                app.kubernetes.io/name: postgresql
+        ports:
+          - protocol: TCP
+            port: 5432
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: unleash-connection-test
+  namespace: default
+  labels:
+    app.kubernetes.io/name: unleash-connection-test
+    app.kubernetes.io/part-of: unleasherator
+  annotations:
+    "helm.sh/hook": test
+    "helm.sh/hook-delete-policy": hook-succeeded
+spec:
+  containers:
+  - name: connection-test
+    image: curlimages/curl:7.88.1
+    command:
+    - sh
+    - -c
+    - |
+      echo "Testing connection to Unleash server..."
+      curl -s --retry 10 --retry-delay 5 --retry-connrefused http://unleash-connection-test:4242/api/admin/health -o /dev/null -w "HTTP Status: %{http_code}\n"
+      if [ $? -eq 0 ]; then
+        echo "Connection successful!"
+        exit 0
+      else
+        echo "Connection failed!"
+        exit 1
+      fi
+  restartPolicy: Never

controllers/unleash_controller.go

@@ -308,9 +308,9 @@ func (r *UnleashReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	// avoid testing connection to the previous instance if the Deployment is not
 	// ready yet. Delay requeue to avoid tying up the reconciler since waiting is
 	// done in the same reconcile loop.
-	log.Info("Waiting for Deployment rollout to finish")
+	log.WithValues("timeout", deploymentTimeout).Info("Waiting for Deployment rollout to finish")
 	if err = r.waitForDeployment(ctx, deploymentTimeout, req.NamespacedName); err != nil {
-		if err := r.updateStatusReconcileFailed(ctx, unleash, err, "Deployment rollout timed out"); err != nil {
+		if err := r.updateStatusReconcileFailed(ctx, unleash, err, fmt.Sprintf("Deployment rollout timed out after %s", deploymentTimeout)); err != nil {
 			return ctrl.Result{RequeueAfter: deploymentTimeout}, err
 		}
 		return ctrl.Result{RequeueAfter: deploymentTimeout}, err