public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'bump-v1.6.0' of github.com:zalando/postgres-operator into bump-v1.6.0

This commit is contained in:
Felix Kunde 2020-12-18 09:44:44 +01:00
parent 512c5148fd 844bbaf6a9
commit 1d16d26e21
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/run.sh
View File

@ -8,7 +8,7 @@ IFS=$'\n\t'
readonly cluster_name="postgres-operator-e2e-tests" readonly cluster_name="postgres-operator-e2e-tests"
readonly kubeconfig_path="/tmp/kind-config-${cluster_name}" readonly kubeconfig_path="/tmp/kind-config-${cluster_name}"
readonly spilo_image="registry.opensource.zalan.do/acid/spilo-13:2.0-p2" readonly spilo_image="registry.opensource.zalan.do/acid/spilo-13-e2e:0.2"
readonly e2e_test_runner_image="registry.opensource.zalan.do/acid/postgres-operator-e2e-tests-runner:0.3" readonly e2e_test_runner_image="registry.opensource.zalan.do/acid/postgres-operator-e2e-tests-runner:0.3"
export GOPATH=${GOPATH-~/go} export GOPATH=${GOPATH-~/go}

6
e2e/tests/test_e2e.py
View File

@ -11,8 +11,8 @@ from kubernetes import client
from tests.k8s_api import K8s from tests.k8s_api import K8s
from kubernetes.client.rest import ApiException from kubernetes.client.rest import ApiException
SPILO_CURRENT = "registry.opensource.zalan.do/acid/spilo-13:2.0-p2" SPILO_CURRENT = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.1"
SPILO_LAZY = "registry.opensource.zalan.do/acid/spilo-cdp-13:2.0-p145" SPILO_LAZY = "registry.opensource.zalan.do/acid/spilo-13-e2e:0.2"
def to_selector(labels): def to_selector(labels):
@ -112,6 +112,7 @@ class EndToEndTestCase(unittest.TestCase):
with open("manifests/configmap.yaml", 'r+') as f: with open("manifests/configmap.yaml", 'r+') as f:
configmap = yaml.safe_load(f) configmap = yaml.safe_load(f)
configmap["data"]["workers"] = "1" configmap["data"]["workers"] = "1"
configmap["data"]["docker_image"] = SPILO_CURRENT
with open("manifests/configmap.yaml", 'w') as f: with open("manifests/configmap.yaml", 'w') as f:
yaml.dump(configmap, f, Dumper=yaml.Dumper) yaml.dump(configmap, f, Dumper=yaml.Dumper)
@ -121,7 +122,6 @@ class EndToEndTestCase(unittest.TestCase):
"operatorconfiguration.crd.yaml", "operatorconfiguration.crd.yaml",
"postgresteam.crd.yaml", "postgresteam.crd.yaml",
"configmap.yaml", "configmap.yaml",
"postgresql-operator-default-configuration.yaml",
"postgres-operator.yaml", "postgres-operator.yaml",
"api-service.yaml", "api-service.yaml",
"infrastructure-roles.yaml", "infrastructure-roles.yaml",