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

fix e2e tests (#672) 

* fix e2e tests
* change Spilo version everywhere
This commit is contained in:
Sergey Dudoladov 2019-09-23 17:48:53 +02:00 committed by Felix Kunde
parent 741694f609
commit cf97ebb2b8
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -95,5 +95,5 @@ test:
hack/verify-codegen.sh hack/verify-codegen.sh
@go test ./... @go test ./...
e2e: e2e: docker # build operator image to be tested
cd e2e; make tools test cd e2e; make tools test clean

2
charts/postgres-operator/values-crd.yaml
View File

@ -22,7 +22,7 @@ configGeneral:
# etcd connection string for Patroni. Empty uses K8s-native DCS. # etcd connection string for Patroni. Empty uses K8s-native DCS.
etcd_host: "" etcd_host: ""
# Spilo docker image # Spilo docker image
docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
# max number of instances in Postgres cluster. -1 = no limit # max number of instances in Postgres cluster. -1 = no limit
min_instances: -1 min_instances: -1
# min number of instances in Postgres cluster. -1 = no limit # min number of instances in Postgres cluster. -1 = no limit

2
charts/postgres-operator/values.yaml
View File

@ -22,7 +22,7 @@ configGeneral:
# etcd connection string for Patroni. Empty uses K8s-native DCS. # etcd connection string for Patroni. Empty uses K8s-native DCS.
etcd_host: "" etcd_host: ""
# Spilo docker image # Spilo docker image
docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
# max number of instances in Postgres cluster. -1 = no limit # max number of instances in Postgres cluster. -1 = no limit
min_instances: "-1" min_instances: "-1"
# min number of instances in Postgres cluster. -1 = no limit # min number of instances in Postgres cluster. -1 = no limit

4
e2e/Makefile
View File

@ -29,7 +29,7 @@ PATH := $(GOPATH)/bin:$(PATH)
default: tools default: tools
clean: clean:
rm -fr manifests rm -rf manifests
copy: clean copy: clean
mkdir manifests mkdir manifests
@ -44,7 +44,7 @@ push: docker
tools: docker tools: docker
# install pinned version of 'kind' # install pinned version of 'kind'
# leave the name as is to avoid overwriting official binary named `kind` # leave the name as is to avoid overwriting official binary named `kind`
wget https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64 wget https://github.com/kubernetes-sigs/kind/releases/download/v0.5.1/kind-linux-amd64
chmod +x kind-linux-amd64 chmod +x kind-linux-amd64
mv kind-linux-amd64 $(KIND_PATH) mv kind-linux-amd64 $(KIND_PATH)

4
manifests/complete-postgres-manifest.yaml
View File

@ -3,7 +3,7 @@ kind: postgresql
metadata: metadata:
name: acid-test-cluster name: acid-test-cluster
spec: spec:
dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
initContainers: initContainers:
- name: date - name: date
image: busybox image: busybox
@ -29,7 +29,7 @@ spec:
enableShmVolume: true enableShmVolume: true
# spiloFSGroup: 103 # spiloFSGroup: 103
postgresql: postgresql:
version: "10" version: "11"
parameters: parameters:
shared_buffers: "32MB" shared_buffers: "32MB"
max_connections: "10" max_connections: "10"

2
manifests/configmap.yaml
View File

@ -19,7 +19,7 @@ data:
# default_cpu_request: 100m # default_cpu_request: 100m
# default_memory_limit: 1Gi # default_memory_limit: 1Gi
# default_memory_request: 100Mi # default_memory_request: 100Mi
docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
# enable_admin_role_for_users: "true" # enable_admin_role_for_users: "true"
# enable_database_access: "true" # enable_database_access: "true"
enable_master_load_balancer: "true" enable_master_load_balancer: "true"

2
manifests/minimal-postgres-manifest.yaml
View File

@ -16,4 +16,4 @@ spec:
databases: databases:
foo: zalando # dbname: owner foo: zalando # dbname: owner
postgresql: postgresql:
version: "10" version: "11"

2
manifests/postgresql-operator-default-configuration.yaml
View File

@ -4,7 +4,7 @@ metadata:
name: postgresql-operator-default-configuration name: postgresql-operator-default-configuration
configuration: configuration:
etcd_host: "" etcd_host: ""
docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
# enable_shm_volume: true # enable_shm_volume: true
max_instances: -1 max_instances: -1
min_instances: -1 min_instances: -1

2
pkg/util/config/config.go
View File

@ -85,7 +85,7 @@ type Config struct {
WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to'
EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS
DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-11:1.5-p9"` DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-11:1.6-p1"`
Sidecars map[string]string `name:"sidecar_docker_images"` Sidecars map[string]string `name:"sidecar_docker_images"`
// default name `operator` enables backward compatibility with the older ServiceAccountName field // default name `operator` enables backward compatibility with the older ServiceAccountName field
PodServiceAccountName string `name:"pod_service_account_name" default:"operator"` PodServiceAccountName string `name:"pod_service_account_name" default:"operator"`