Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/postgres-operator/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ rules:
- get
- list
- patch
- watch # needed if zalando-postgres-operator account is used for pods as well
- watch # needed if zalando-postgres-operator account is used for pods as well
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -76,7 +76,7 @@ rules:
verbs:
- get
- list
- update # only for resizing AWS volumes
- update # only for resizing AWS volumes
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -145,7 +145,7 @@ rules:
- apiGroups:
- batch
resources:
- cronjobs # enables logical backups
- cronjobs # enables logical backups
verbs:
- create
- delete
Expand Down
4 changes: 2 additions & 2 deletions charts/postgres-operator/values-crd.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
registry: registry.opensource.zalan.do
repository: acid/postgres-operator
tag: v1.1.0-54-g3a914f9
tag: v1.2.0
pullPolicy: "IfNotPresent"

# Optionally specify an array of imagePullSecrets.
Expand Down Expand Up @@ -98,7 +98,7 @@ configKubernetes:
# whether the Spilo container should run in privileged mode
spilo_privileged: false
# operator watches for postgres objects in the given namespace
watched_namespace: "*" # listen to all namespaces
watched_namespace: "*" # listen to all namespaces

# configure resource requests for the Postgres pods
configPostgresPodResources:
Expand Down
4 changes: 2 additions & 2 deletions charts/postgres-operator/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
registry: registry.opensource.zalan.do
repository: acid/postgres-operator
tag: v1.1.0-54-g3a914f9
tag: v1.2.0
pullPolicy: "IfNotPresent"

# Optionally specify an array of imagePullSecrets.
Expand Down Expand Up @@ -94,7 +94,7 @@ configKubernetes:
# whether the Spilo container should run in privileged mode
spilo_privileged: "false"
# operator watches for postgres objects in the given namespace
watched_namespace: "*" # listen to all namespaces
watched_namespace: "*" # listen to all namespaces

# configure resource requests for the Postgres pods
configPostgresPodResources:
Expand Down
8 changes: 4 additions & 4 deletions manifests/complete-postgres-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ spec:
size: 1Gi
# storageClass: my-sc
numberOfInstances: 2
users: # Application/Robot users
users: # Application/Robot users
zalando:
- superuser
- createdb
enableMasterLoadBalancer: true
enableReplicaLoadBalancer: true
allowedSourceRanges: # load balancers' source ranges for both master and replica services
allowedSourceRanges: # load balancers' source ranges for both master and replica services
- 127.0.0.1/32
databases:
foo: zalando
Expand Down Expand Up @@ -66,14 +66,14 @@ spec:
# clone:
# uid: "efd12e58-5786-11e8-b5a7-06148230260c"
# cluster: "acid-batman"
# timestamp: "2017-12-19T12:40:33+01:00" # timezone required (offset relative to UTC, see RFC 3339 section 5.6)
# timestamp: "2017-12-19T12:40:33+01:00" # timezone required (offset relative to UTC, see RFC 3339 section 5.6)
# s3_wal_path: "s3://custom/path/to/bucket"

# run periodic backups with k8s cron jobs
# enableLogicalBackup: true
# logicalBackupSchedule: "30 00 * * *"
maintenanceWindows:
- 01:00-06:00 #UTC
- 01:00-06:00 #UTC
- Sat:00:00-04:00
# sidecars:
# - name: "telegraf-sidecar"
Expand Down
2 changes: 1 addition & 1 deletion manifests/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ data:
# teams_api_url: http://fake-teams-api.default.svc.cluster.local
# toleration: ""
# wal_s3_bucket: ""
watched_namespace: "*" # listen to all namespaces
watched_namespace: "*" # listen to all namespaces
workers: "4"
6 changes: 3 additions & 3 deletions manifests/minimal-postgres-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ spec:
size: 1Gi
numberOfInstances: 2
users:
zalando: # database owner
zalando: # database owner
- superuser
- createdb
foo_user: [] # role for application foo
foo_user: [] # role for application foo
databases:
foo: zalando # dbname: owner
foo: zalando # dbname: owner
postgresql:
version: "10"
6 changes: 3 additions & 3 deletions manifests/operator-service-account-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ rules:
- get
- list
- patch
- watch # needed if zalando-postgres-operator account is used for pods as well
- watch # needed if zalando-postgres-operator account is used for pods as well
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -77,7 +77,7 @@ rules:
verbs:
- get
- list
- update # only for resizing AWS volumes
- update # only for resizing AWS volumes
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -146,7 +146,7 @@ rules:
- apiGroups:
- batch
resources:
- cronjobs # enables logical backups
- cronjobs # enables logical backups
verbs:
- create
- delete
Expand Down
2 changes: 1 addition & 1 deletion manifests/postgres-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
serviceAccountName: zalando-postgres-operator
containers:
- name: postgres-operator
image: registry.opensource.zalan.do/acid/smoke-tested-postgres-operator:v1.0.0-37-g2422d72
image: registry.opensource.zalan.do/acid/postgres-operator:v1.2.0
imagePullPolicy: IfNotPresent
resources:
requests:
Expand Down
3 changes: 1 addition & 2 deletions manifests/standby-manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

apiVersion: "acid.zalan.do/v1"
kind: postgresql
metadata:
Expand All @@ -16,5 +15,5 @@ spec:
s3_wal_path: "s3://path/to/bucket/containing/wal/of/source/cluster/"

maintenanceWindows:
- 01:00-06:00 #UTC
- 01:00-06:00 #UTC
- Sat:00:00-04:00