Skip to content

Commit 686015f

Browse files
author
matthias
committed
move to new Version of Operator and modify some value-stuff
1 parent 60b67be commit 686015f

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# exclude some folders
22
setup/helm/configmap.yaml
33
setup/monitoring
4-
setup/operator
4+
setup/operator
5+
setup/monitoring.tar.gz

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-os-container:postgres-rocky-14.6-1-dev'
6+
#dockerImage: 'docker.io/cybertecpostgresql/cybertec-os-container:postgres-rocky-14.6-1-dev'
77
numberOfInstances: 1
88
postgresql:
99
version: '14'

setup/helm/operator/templates/NOTES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The operator has been successfully installed and is ready for use.
99

1010
Support for use can be found here:
1111
Community mailing list:
12-
Github project: https://github.com/cybertec-postgresql/postgres-operator
12+
Github project: https://github.com/cybertec-postgresql/postgres-pg-operator
1313
Documentation:
1414

1515
Apache License Version 2.0

setup/helm/operator/templates/infrastructure_role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
kind: Secret
33
metadata:
44
name: cpo-monitoring-role
5-
namespace: zalando
5+
namespace: {{ .Values.operatorSettings.operator_namespace }}
66
type: Opaque
77
stringData:
88
user: postgres_exporter

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: OperatorConfiguration
33
metadata:
44
name: postgresql-operator-configuration
55
configuration:
6-
docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p7
6+
docker_image: docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-4
77
# enable_crd_registration: true
88
# crd_categories:
99
# - all
@@ -38,14 +38,14 @@ configuration:
3838
enable_password_rotation: false
3939
password_rotation_interval: 90
4040
password_rotation_user_retention: 180
41-
replication_username: standby
41+
replication_username: cpo_replication
4242
super_username: postgres
4343
major_version_upgrade:
4444
major_version_upgrade_mode: "manual"
4545
# major_version_upgrade_team_allow_list:
4646
# - acid
47-
minimal_major_version: "10"
48-
target_major_version: "14"
47+
minimal_major_version: "13"
48+
target_major_version: "15"
4949
kubernetes:
5050
# additional_pod_capabilities:
5151
# - "SYS_NICE"
@@ -111,7 +111,7 @@ configuration:
111111
# key: db-only
112112
# operator: Exists
113113
# effect: NoSchedule
114-
# watched_namespace: ""
114+
watched_namespace: {{ .Values.operatorSettings.watched_namespace | default * }}
115115
postgres_pod_resources:
116116
default_cpu_limit: "1"
117117
default_cpu_request: 100m

setup/helm/operator/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ imagePullSecretNames: []
1515

1616
# Define the operator settings to add to the configmap
1717
operatorSettings:
18-
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.5.0-2'
19-
namespace: '*'
18+
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.6.0-1'
19+
watched_namespace: '*'
2020
enable_pod_antiaffinity: 'true'
21-
operator_namespace: 'zalando'
21+
operator_namespace: 'cpo'
2222

2323

setup/monitoring.tar.gz

21.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)