Skip to content

Commit 3ecb23a

Browse files
authored
Merge pull request #13 from cybertec-postgresql/v0.7.0-rc1
rc5
2 parents 5c8563c + a9e2fdb commit 3ecb23a

File tree

11 files changed

+16
-16
lines changed

11 files changed

+16
-16
lines changed

cluster-tutorials/configure_users_and_databases/postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'

cluster-tutorials/high-availability-cluster/ha-postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: ha-cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
77
numberOfInstances: 2
88
postgresql:
99
version: '16'

cluster-tutorials/monitored_cluster/postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
cpo_monitoring_stack: 'true'
77
spec:
8-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
8+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
99
numberOfInstances: 1
1010
postgresql:
1111
version: '16'

cluster-tutorials/pgbackrest_with_s3/postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'

cluster-tutorials/prepared_databases/postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'

cluster-tutorials/single-cluster/postgres.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: postgresql
33
metadata:
44
name: cluster-1
55
spec:
6-
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
6+
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
77
numberOfInstances: 1
88
postgresql:
99
version: '16'

setup/helm/operator/templates/operator-service-account-rbac-openshift.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apiVersion: v1
22
kind: ServiceAccount
33
metadata:
4-
name: postgres-operator
4+
name: cpo-operator
55
namespace: {{ .Values.operatorSettings.operator_namespace }}
66

77
---
88
apiVersion: rbac.authorization.k8s.io/v1
99
kind: ClusterRole
1010
metadata:
11-
name: postgres-operator
11+
name: cpo-operator
1212
rules:
1313
# all verbs allowed for custom operator resources
1414
- apiGroups:
@@ -202,7 +202,7 @@ rules:
202202
verbs:
203203
- get
204204
- create
205-
# to create role bindings to the postgres-pod service account
205+
# to create role bindings to the cpo-pod service account
206206
- apiGroups:
207207
- rbac.authorization.k8s.io
208208
resources:
@@ -224,21 +224,21 @@ rules:
224224
apiVersion: rbac.authorization.k8s.io/v1
225225
kind: ClusterRoleBinding
226226
metadata:
227-
name: postgres-operator
227+
name: cpo-operator
228228
roleRef:
229229
apiGroup: rbac.authorization.k8s.io
230230
kind: ClusterRole
231-
name: postgres-operator
231+
name: cpo-operator
232232
subjects:
233233
- kind: ServiceAccount
234-
name: postgres-operator
234+
name: cpo-operator
235235
namespace: {{ .Values.operatorSettings.operator_namespace }}
236236

237237
---
238238
apiVersion: rbac.authorization.k8s.io/v1
239239
kind: ClusterRole
240240
metadata:
241-
name: postgres-pod
241+
name: cpo-pod
242242
rules:
243243
# Patroni needs to watch and manage config maps
244244
- apiGroups:

setup/helm/operator/templates/postgres-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
name: postgres-operator
1818
cpo.cybertec.at/pod-type: postgres-operator
1919
spec:
20-
serviceAccountName: postgres-operator
20+
serviceAccountName: cpo-operator
2121
containers:
2222
- name: postgres-operator
2323
image: {{ .Values.operatorSettings.operatorImage }}

setup/helm/operator/templates/postgresql-operator-configuration.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ configuration:
9797
# pod_priority_class_name: "postgres-pod-priority"
9898
pod_role_label: spilo-role
9999
# pod_service_account_definition: ""
100-
pod_service_account_name: postgres-pod
100+
pod_service_account_name: cpo-pod
101101
# pod_service_account_role_binding_definition: ""
102102
pod_terminate_grace_period: 5m
103103
secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}"

setup/helm/operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ imagePullSecretNames: []
1515

1616
# Define the operator settings to add to the configmap
1717
operatorSettings:
18-
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.7.0-rc1'
18+
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.7.0-rc5'
1919
watched_namespace: '*'
2020
enable_pod_antiaffinity: 'true'
2121
operator_namespace: 'cpo'

setup/monitoring.tar.gz

-21.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)