Skip to content

Commit 6cea6c4

Browse files
committed
some modifications
1 parent 82c02aa commit 6cea6c4

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ rules:
5050
# - update
5151
# - watch
5252
# to create or get/update CRDs when starting up
53-
- apiGroups:
54-
- apiextensions.k8s.io
55-
resources:
56-
- customresourcedefinitions
57-
verbs:
58-
- create
59-
- get
60-
- patch
61-
- update
53+
# - apiGroups:
54+
# - apiextensions.k8s.io
55+
# resources:
56+
# - customresourcedefinitions
57+
# verbs:
58+
# - create
59+
# - get
60+
# - patch
61+
# - update
6262
# to read configuration and manage ConfigMaps used by Patroni
6363
- apiGroups:
6464
- ""

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

Lines changed: 3 additions & 3 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: docker.io/cybertecpostgresql/cybertec-pg-container:postgres-15.2-4
6+
docker_image: {{ .Values.operatorSettings.postgresImage }}
77
# enable_crd_registration: true
88
# crd_categories:
99
# - all
@@ -52,7 +52,7 @@ configuration:
5252
cluster_domain: cluster.local
5353
cluster_labels:
5454
application: cpo
55-
cluster_name_label: cluster-name
55+
cluster_name_label: cluster.cpo.opensource.cybertec.at/name
5656
inherited_labels:
5757
- cpo_monitoring_stack
5858
# custom_pod_annotations:
@@ -95,7 +95,7 @@ configuration:
9595
# pod_environment_secret: "my-custom-secret"
9696
pod_management_policy: "ordered_ready"
9797
# pod_priority_class_name: "postgres-pod-priority"
98-
pod_role_label: spilo-role
98+
pod_role_label: member.cpo.opensource.cybertec.at/role
9999
# pod_service_account_definition: ""
100100
pod_service_account_name: cpo-pod
101101
# pod_service_account_role_binding_definition: ""

setup/helm/operator/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ imagePullSecretNames: []
1616
# Define the operator settings to add to the configmap
1717
operatorSettings:
1818
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:v0.7.0-2-rc1'
19+
postgresImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.2-2-rc1'
1920
watched_namespace: '*'
2021
enable_pod_antiaffinity: 'true'
2122
operator_namespace: 'cpo'

0 commit comments

Comments
 (0)