Skip to content
Merged

rc5 #13

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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
numberOfInstances: 1
postgresql:
version: '16'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: postgresql
metadata:
name: ha-cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
numberOfInstances: 2
postgresql:
version: '16'
Expand Down
2 changes: 1 addition & 1 deletion cluster-tutorials/monitored_cluster/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
cpo_monitoring_stack: 'true'
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
numberOfInstances: 1
postgresql:
version: '16'
Expand Down
2 changes: 1 addition & 1 deletion cluster-tutorials/pgbackrest_with_s3/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
numberOfInstances: 1
postgresql:
version: '16'
Expand Down
2 changes: 1 addition & 1 deletion cluster-tutorials/prepared_databases/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
numberOfInstances: 1
postgresql:
version: '16'
Expand Down
2 changes: 1 addition & 1 deletion cluster-tutorials/single-cluster/postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: postgresql
metadata:
name: cluster-1
spec:
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-rocky9-16.0-1-1'
dockerImage: 'docker.io/cybertecpostgresql/cybertec-pg-container:postgres-16.1-3-dev'
numberOfInstances: 1
postgresql:
version: '16'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: postgres-operator
name: cpo-operator
namespace: {{ .Values.operatorSettings.operator_namespace }}

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: postgres-operator
name: cpo-operator
rules:
# all verbs allowed for custom operator resources
- apiGroups:
Expand Down Expand Up @@ -202,7 +202,7 @@ rules:
verbs:
- get
- create
# to create role bindings to the postgres-pod service account
# to create role bindings to the cpo-pod service account
- apiGroups:
- rbac.authorization.k8s.io
resources:
Expand All @@ -224,21 +224,21 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: postgres-operator
name: cpo-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: postgres-operator
name: cpo-operator
subjects:
- kind: ServiceAccount
name: postgres-operator
name: cpo-operator
namespace: {{ .Values.operatorSettings.operator_namespace }}

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: postgres-pod
name: cpo-pod
rules:
# Patroni needs to watch and manage config maps
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion setup/helm/operator/templates/postgres-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
name: postgres-operator
cpo.cybertec.at/pod-type: postgres-operator
spec:
serviceAccountName: postgres-operator
serviceAccountName: cpo-operator
containers:
- name: postgres-operator
image: {{ .Values.operatorSettings.operatorImage }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ configuration:
# pod_priority_class_name: "postgres-pod-priority"
pod_role_label: spilo-role
# pod_service_account_definition: ""
pod_service_account_name: postgres-pod
pod_service_account_name: cpo-pod
# pod_service_account_role_binding_definition: ""
pod_terminate_grace_period: 5m
secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
Expand Down
2 changes: 1 addition & 1 deletion setup/helm/operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ imagePullSecretNames: []

# Define the operator settings to add to the configmap
operatorSettings:
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.7.0-rc1'
operatorImage: 'docker.io/cybertecpostgresql/cybertec-pg-operator:0.7.0-rc5'
watched_namespace: '*'
enable_pod_antiaffinity: 'true'
operator_namespace: 'cpo'
Expand Down
Binary file removed setup/monitoring.tar.gz
Binary file not shown.