Skip to content

Commit

Permalink
Changes in regards to review.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan-M committed Oct 24, 2017
1 parent 453fdbf commit 0750419
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ endif
LOCAL_BUILD_FLAGS ?= $(BUILD_FLAGS)
LDFLAGS ?= -X=main.version=$(VERSION)
DOCKERFILE = docker/Dockerfile
IMAGE ?= pierone.example.com/acid/$(BINARY)
IMAGE ?= registry.opensource.zalan.do/acid/$(BINARY)
TAG ?= $(VERSION)
GITHEAD = $(shell git rev-parse --short HEAD)
GITURL = $(shell git config --get remote.origin.url)
GITSTATUS = $(shell git status --porcelain || echo "no changes")
SOURCES = cmd/main.go
VERSION ?= $(shell git describe --tags --always --dirty)
IMAGE ?= pierone.example.com/acid/$(BINARY)
DIRS := cmd pkg
PKG := `go list ./... | grep -v /vendor/`

Expand Down
2 changes: 1 addition & 1 deletion manifests/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ data:
team_admin_role: "admin"
teams_api_url: http://fake-teams-api.default.svc.cluster.local
workers: "4"
enable_load_balancer: "false"
enable_load_balancer: "true"
api_port: "8080"
ring_log_lines: "100"
cluster_history_entries: "1000"
Expand Down
2 changes: 0 additions & 2 deletions manifests/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,3 @@ apiVersion: v1
kind: ServiceAccount
metadata:
name: operator
imagePullSecrets:
- name: pierone.example.com
2 changes: 1 addition & 1 deletion manifests/testpostgresql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
foo: zalando
#Expert section
postgresql:
version: "9.6"
version: "10"
parameters:
shared_buffers: "32MB"
max_connections: "10"
Expand Down

0 comments on commit 0750419

Please sign in to comment.