fix e2e tests
This commit is contained in:
		
							parent
							
								
									741694f609
								
							
						
					
					
						commit
						06b490df97
					
				
							
								
								
									
										4
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										4
									
								
								Makefile
								
								
								
								
							|  | @ -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 | ||||||
|  |  | ||||||
|  | @ -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) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -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" | ||||||
|  |  | ||||||
|  | @ -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" | ||||||
|  |  | ||||||
|  | @ -16,4 +16,4 @@ spec: | ||||||
|   databases: |   databases: | ||||||
|     foo: zalando  # dbname: owner |     foo: zalando  # dbname: owner | ||||||
|   postgresql: |   postgresql: | ||||||
|     version: "10" |     version: "11" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue