Merge pull request #278 from gocardless/rnaveiras-theatre-resources

Wait for theatre resources to be ready

cmd/acceptance/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	stdlog "log"
 	"os"
@@ -134,12 +135,19 @@ func main() {
 		}
 
 		logger.Log("msg", "waiting for setup resources to run")
+		contextTimeout := 3 * time.Minute
+		ctx, deadline := context.WithTimeout(ctx, contextTimeout)
+		defer deadline()
 		waitCmd := exec.CommandContext(ctx, "kubectl", "--context", fmt.Sprintf("kind-%s", *clusterName), "wait", "--all-namespaces", "--for", "condition=Ready", "pods", "--all", "--timeout", "2m")
 
 		if err := pipeOutput(waitCmd).Run(); err != nil {
 			app.Fatalf("not all setup resources are running: %v", err)
 		}
 
+		if ctx.Err() == context.DeadlineExceeded {
+			app.Fatalf("context deadline: no all setup resources are running: %v", err)
+		}
+
 		logger.Log("msg", "generating theatre manifests")
 		manifests, err := exec.CommandContext(ctx, "kustomize", "build", "config/acceptance").Output()
 		if err != nil {
@@ -154,6 +162,19 @@ func main() {
 			app.Fatalf("failed to install theatre manifests into cluster: %v", err)
 		}
 
+		logger.Log("msg", "waiting for Theatre resources are running")
+		ctx, deadline = context.WithTimeout(ctx, contextTimeout)
+		defer deadline()
+		waitCmd = exec.CommandContext(ctx, "kubectl", "--context", fmt.Sprintf("kind-%s", *clusterName), "wait", "--all-namespaces", "--for", "condition=Ready", "pods", "--all", "--timeout", "2m")
+
+		if err := pipeOutput(waitCmd).Run(); err != nil {
+			app.Fatalf("not all theatre resources are running: %v", err)
+		}
+
+		if ctx.Err() == context.DeadlineExceeded {
+			app.Fatalf("context deadline: no all theatre resources are running: %v", err)
+		}
+
 		cfg := mustClusterConfig()
 
 		for _, runner := range Runners {

config/acceptance/overlays/rbac-manager.yaml

@@ -14,3 +14,6 @@ spec:
           args:
             - --no-google  # disable Google for acceptance tests
             - --metrics-address=0.0.0.0
+          resources:
+            requests:
+              cpu: "100m"

config/acceptance/overlays/vault-manager.yaml

@@ -14,3 +14,6 @@ spec:
           args:
             - --theatre-image=$(THEATRE_IMAGE)
             - --metrics-address=0.0.0.0
+          resources:
+            requests:
+              cpu: "100m"

config/acceptance/overlays/workloads-manager.yaml

@@ -11,3 +11,6 @@ spec:
         - name: manager
           image: theatre:latest
           imagePullPolicy: Never
+          resources:
+            requests:
+              cpu: "100m"