diff --git a/.gitignore b/.gitignore index f68cb20..af3191c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # exclude some folders setup/helm/configmap.yaml setup/monitoring -setup/operator \ No newline at end of file +setup/operator +setup/monitoring.tar.gz \ No newline at end of file diff --git a/cluster-tutorials/single-cluster/postgres.yaml b/cluster-tutorials/single-cluster/postgres.yaml index 323fe2d..0426567 100644 --- a/cluster-tutorials/single-cluster/postgres.yaml +++ b/cluster-tutorials/single-cluster/postgres.yaml @@ -3,7 +3,7 @@ kind: postgresql metadata: name: cluster-1 spec: - dockerImage: 'docker.io/cybertecpostgresql/cybertec-os-container:postgres-rocky-14.6-1-dev' + #dockerImage: 'docker.io/cybertecpostgresql/cybertec-os-container:postgres-rocky-14.6-1-dev' numberOfInstances: 1 postgresql: version: '14' diff --git a/setup/helm/operator/templates/NOTES.txt b/setup/helm/operator/templates/NOTES.txt index 12569c9..b70556a 100644 --- a/setup/helm/operator/templates/NOTES.txt +++ b/setup/helm/operator/templates/NOTES.txt @@ -9,7 +9,7 @@ The operator has been successfully installed and is ready for use. Support for use can be found here: Community mailing list: -Github project: https://github.com/cybertec-postgresql/postgres-operator +Github project: https://github.com/cybertec-postgresql/postgres-pg-operator Documentation: Apache License Version 2.0 diff --git a/setup/helm/operator/templates/infrastructure_role.yaml b/setup/helm/operator/templates/infrastructure_role.yaml index be7403b..fafd2b1 100644 --- a/setup/helm/operator/templates/infrastructure_role.yaml +++ b/setup/helm/operator/templates/infrastructure_role.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: name: cpo-monitoring-role - namespace: zalando + namespace: {{ .Values.operatorSettings.operator_namespace }} type: Opaque stringData: user: postgres_exporter diff --git a/setup/helm/operator/templates/postgresql-operator-configuration.yaml b/setup/helm/operator/templates/postgresql-operator-configuration.yaml index 9be763b..e07bed5 100644 --- a/setup/helm/operator/templates/postgresql-operator-configuration.yaml +++ b/setup/helm/operator/templates/postgresql-operator-configuration.yaml @@ -3,7 +3,7 @@ kind: OperatorConfiguration metadata: name: postgresql-operator-configuration configuration: - docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p7 + docker_image: docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-4 # enable_crd_registration: true # crd_categories: # - all @@ -38,14 +38,14 @@ configuration: enable_password_rotation: false password_rotation_interval: 90 password_rotation_user_retention: 180 - replication_username: standby + replication_username: cpo_replication super_username: postgres major_version_upgrade: major_version_upgrade_mode: "manual" # major_version_upgrade_team_allow_list: # - acid - minimal_major_version: "10" - target_major_version: "14" + minimal_major_version: "13" + target_major_version: "15" kubernetes: # additional_pod_capabilities: # - "SYS_NICE" @@ -111,7 +111,7 @@ configuration: # key: db-only # operator: Exists # effect: NoSchedule - # watched_namespace: "" + watched_namespace: "*" postgres_pod_resources: default_cpu_limit: "1" default_cpu_request: 100m @@ -171,9 +171,9 @@ configuration: debug_logging: true enable_database_access: true teams_api: - # enable_admin_role_for_users: true - # enable_postgres_team_crd: false - # enable_postgres_team_crd_superusers: false + enable_admin_role_for_users: false + enable_postgres_team_crd: false + enable_postgres_team_crd_superusers: false enable_team_member_deprecation: false enable_team_superuser: false enable_teams_api: false diff --git a/setup/helm/operator/values.yaml b/setup/helm/operator/values.yaml index 796e7b1..57bf31d 100644 --- a/setup/helm/operator/values.yaml +++ b/setup/helm/operator/values.yaml @@ -15,9 +15,9 @@ imagePullSecretNames: [] # Define the operator settings to add to the configmap operatorSettings: - operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.5.0-2' - namespace: '*' + operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.6.0-1' + watched_namespace: '*' enable_pod_antiaffinity: 'true' - operator_namespace: 'zalando' + operator_namespace: 'cpo' diff --git a/setup/monitoring.tar.gz b/setup/monitoring.tar.gz new file mode 100644 index 0000000..1cfd0f7 Binary files /dev/null and b/setup/monitoring.tar.gz differ