More e2e related changes. Add curl to operator image.

docker/Dockerfile

@@ -2,6 +2,7 @@ FROM alpine
 MAINTAINER Team ACID @ Zalando <team-acid@zalando.de>
 
 # We need root certificates to deal with teams api over https
+RUN apk --no-cache add curl
 RUN apk --no-cache add ca-certificates
 
 COPY build/* /

e2e/Makefile

@@ -51,3 +51,6 @@ tools:
 
 e2etest: tools copy clean
 	./run.sh main
+
+cleanup: clean
+	./run.sh cleanup

e2e/README.md

@@ -33,7 +33,7 @@ runtime.
 In the e2e folder you can invoke tests either with `make test` or with:
 
 ```bash
-./run.sh
+./run.sh main
 ```
 
 To run both the build and test step you can invoke `make e2e` from the parent
@@ -41,7 +41,7 @@ directory.
 
 To run the end 2 end test and keep the kind state execute:
 ```bash
-NOCLEANUP=True ./run.sh
+NOCLEANUP=True ./run.sh main
 ```
 
 ## Run indidual test

e2e/scripts/watch_objects.sh

@@ -16,4 +16,6 @@ echo
 kubectl get pods -l name=postgres-operator -o jsonpath='{.items..metadata.annotations.step}'
 echo
 kubectl get pods -l application=spilo -o jsonpath='{.items..spec.containers..image}'
+echo
+kubectl exec -it $(kubectl get pods -l name=postgres-operator -o jsonpath='{.items.name}') -- curl localhost:8008/api/status/queue/
 "

e2e/tests/test_e2e.py

@@ -109,9 +109,18 @@ class EndToEndTestCase(unittest.TestCase):
         with open("manifests/postgres-operator.yaml", 'w') as f:
             yaml.dump(operator_deployment, f, Dumper=yaml.Dumper)
 
+        with open("manifests/configmap.yaml", 'r+') as f:
+                    configmap = yaml.safe_load(f)
+                    configmap["data"]["workers"] = "1"
+
+        with open("manifests/configmap.yaml", 'w') as f:
+            yaml.dump(configmap, f, Dumper=yaml.Dumper)
+
         for filename in ["operator-service-account-rbac.yaml",
+                         "postgresteam.crd.yaml",
                          "configmap.yaml",
                          "postgres-operator.yaml",
+                         "api-service.yaml",
                          "infrastructure-roles.yaml",
                          "infrastructure-roles-new.yaml",
                          "e2e-storage-class.yaml"]: