Bumping spilo. Load before test.

e2e/Dockerfile

@@ -1,8 +1,10 @@
 # An image to run e2e tests.
 # The image does not include the tests; all necessary files are bind-mounted when a container starts.
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
 
+ENV TERM xterm-256color
+
 COPY requirements.txt ./
 COPY scm-source.json ./
 
@@ -13,7 +15,7 @@ RUN apt-get update \
            python3-pip \
            curl \
     && pip3 install --no-cache-dir -r requirements.txt \
-    && curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubectl \
+    && curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/amd64/kubectl \
     && chmod +x ./kubectl \
     && mv ./kubectl /usr/local/bin/kubectl \
     && apt-get clean \

e2e/Makefile

@@ -50,4 +50,4 @@ tools:
 	cd "/tmp" && GO111MODULE=on go get sigs.k8s.io/kind@v0.8.1
 
 e2etest: tools copy clean
-	./run.sh
+	./run.sh main

e2e/kind-cluster-postgres-operator-e2e-tests.yaml

@@ -1,5 +1,5 @@
 kind: Cluster
-apiVersion: kind.sigs.k8s.io/v1alpha3
+apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
 - role: worker

e2e/run.sh

@@ -6,10 +6,9 @@ set -o nounset
 set -o pipefail
 IFS=$'\n\t'
 
-cd $(dirname "$0");
-
 readonly cluster_name="postgres-operator-e2e-tests"
 readonly kubeconfig_path="/tmp/kind-config-${cluster_name}"
+readonly spilo_image="registry.opensource.zalan.do/acid/spilo-12:1.6-p5"
 
 echo "Clustername: ${cluster_name}"
 echo "Kubeconfig path: ${kubeconfig_path}"
@@ -39,6 +38,8 @@ function start_kind(){
   export KUBECONFIG="${kubeconfig_path}"
   kind create cluster --name ${cluster_name} --config kind-cluster-postgres-operator-e2e-tests.yaml
   kind load docker-image "${operator_image}" --name ${cluster_name}
+  docker pull "${spilo_image}"
+  kind load docker-image "${spilo_image}" --name ${cluster_name}
 }
 
 function set_kind_api_server_ip(){
@@ -55,7 +56,7 @@ function run_tests(){
 
   # tests modify files in ./manifests, so we mount a copy of this directory done by the e2e Makefile
 
-  docker run -it --rm --network=host \
+  docker run --rm --network=host -e "TERM=xterm-256color" \
   --mount type=bind,source="$(readlink -f ${kubeconfig_path})",target=/root/.kube/config \
   --mount type=bind,source="$(readlink -f manifests)",target=/manifests \
   --mount type=bind,source="$(readlink -f tests)",target=/tests \
@@ -75,11 +76,11 @@ function main(){
 
   trap "clean_up" QUIT TERM EXIT
 
-  pull_images
-  start_kind
-  set_kind_api_server_ip
+  time pull_images
+  time start_kind
+  time set_kind_api_server_ip
   run_tests
   exit 0
 }
 
-main "$@"
+"$@"

manifests/configmap.yaml

@@ -15,7 +15,7 @@ data:
   # connection_pooler_default_cpu_request: "500m"
   # connection_pooler_default_memory_limit: 100Mi
   # connection_pooler_default_memory_request: 100Mi
-  connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-9"
+  connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-11"
   # connection_pooler_max_db_connections: 60
   # connection_pooler_mode: "transaction"
   # connection_pooler_number_of_instances: 2
@@ -31,7 +31,7 @@ data:
   # default_memory_request: 100Mi
   # delete_annotation_date_key: delete-date
   # delete_annotation_name_key: delete-clustername
-  docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p3
+  docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p5
   # downscaler_annotations: "deployment-time,downscaler/*"
   # enable_admin_role_for_users: "true"
   # enable_crd_validation: "true"