mirror of
https://github.com/zalando/postgres-operator.git
synced 2026-10-06 16:33:27 +02:00
switch toggles to be true by default and add them to validation
This commit is contained in:
+1
-5
@@ -23,7 +23,6 @@ ifndef GOPATH
|
||||
GOPATH := $(HOME)/go
|
||||
endif
|
||||
|
||||
KIND_PATH := $(GOPATH)/bin
|
||||
PATH := $(GOPATH)/bin:$(PATH)
|
||||
|
||||
default: tools
|
||||
@@ -43,10 +42,7 @@ push: docker
|
||||
|
||||
tools: docker
|
||||
# install pinned version of 'kind'
|
||||
# leave the name as is to avoid overwriting official binary named `kind`
|
||||
wget https://github.com/kubernetes-sigs/kind/releases/download/v0.5.1/kind-linux-amd64
|
||||
chmod +x kind-linux-amd64
|
||||
mv kind-linux-amd64 $(KIND_PATH)
|
||||
GO111MODULE=on go get sigs.k8s.io/kind@v0.5.1
|
||||
|
||||
test:
|
||||
./run.sh
|
||||
|
||||
+7
-7
@@ -30,15 +30,15 @@ function pull_images(){
|
||||
function start_kind(){
|
||||
|
||||
# avoid interference with previous test runs
|
||||
if [[ $(kind-linux-amd64 get clusters | grep "^${cluster_name}*") != "" ]]
|
||||
if [[ $(kind get clusters | grep "^${cluster_name}*") != "" ]]
|
||||
then
|
||||
kind-linux-amd64 delete cluster --name ${cluster_name}
|
||||
kind delete cluster --name ${cluster_name}
|
||||
fi
|
||||
|
||||
kind-linux-amd64 create cluster --name ${cluster_name} --config kind-cluster-postgres-operator-e2e-tests.yaml
|
||||
kind-linux-amd64 load docker-image "${operator_image}" --name ${cluster_name}
|
||||
kind-linux-amd64 load docker-image "${e2e_test_image}" --name ${cluster_name}
|
||||
KUBECONFIG="$(kind-linux-amd64 get kubeconfig-path --name=${cluster_name})"
|
||||
kind create cluster --name ${cluster_name} --config kind-cluster-postgres-operator-e2e-tests.yaml
|
||||
kind load docker-image "${operator_image}" --name ${cluster_name}
|
||||
kind load docker-image "${e2e_test_image}" --name ${cluster_name}
|
||||
KUBECONFIG="$(kind get kubeconfig-path --name=${cluster_name})"
|
||||
export KUBECONFIG
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ function run_tests(){
|
||||
|
||||
function clean_up(){
|
||||
unset KUBECONFIG
|
||||
kind-linux-amd64 delete cluster --name ${cluster_name}
|
||||
kind delete cluster --name ${cluster_name}
|
||||
rm -rf ${kubeconfig_path}
|
||||
}
|
||||
|
||||
|
||||
@@ -65,15 +65,6 @@ class EndToEndTestCase(unittest.TestCase):
|
||||
'''
|
||||
k8s = self.k8s
|
||||
|
||||
# enable sidecars in cluster
|
||||
toggle_sidecar_creation = {
|
||||
"data": {
|
||||
"enable_init_containers": "true",
|
||||
"enable_sidecars": "true",
|
||||
}
|
||||
}
|
||||
k8s.update_config(toggle_sidecar_creation)
|
||||
|
||||
with open("manifests/complete-postgres-manifest.yaml", 'r+') as f:
|
||||
pg_manifest = yaml.safe_load(f)
|
||||
pg_manifest["metadata"]["namespace"] = self.namespace
|
||||
|
||||
Reference in New Issue
Block a user