public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix typos

This commit is contained in:
Rafia Sabih 2020-04-30 10:13:54 +02:00
parent 83849befd0
commit 8c742dfcc8
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/configmap.yaml
View File

@ -94,7 +94,7 @@ data:
# sidecar_docker_images: "" # sidecar_docker_images: ""
# set_memory_request_to_limit: "false" # set_memory_request_to_limit: "false"
spilo_privileged: "false" spilo_privileged: "false"
# statefulset_propagate_annotation: "deployment-time,downscaler/*" # statefulset_propagate_annotations: "deployment-time,downscaler/*"
super_username: postgres super_username: postgres
# team_admin_role: "admin" # team_admin_role: "admin"
# team_api_role_configuration: "log_statement:all" # team_api_role_configuration: "log_statement:all"

2
manifests/postgresql-operator-default-configuration.yaml
View File

@ -4,7 +4,7 @@ metadata:
name: postgresql-operator-default-configuration name: postgresql-operator-default-configuration
configuration: configuration:
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115 docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115
# statefulset_propagate_annotation: # statefulset_propagate_annotations:
# - deployment-time # - deployment-time
# - downscaler/* # - downscaler/*
# enable_crd_validation: true # enable_crd_validation: true

2
pkg/cluster/resources.go
View File

@ -869,7 +869,7 @@ func (c *Cluster) updateConnectionPoolerAnnotations(annotations map[string]strin
metav1.PatchOptions{}, metav1.PatchOptions{},
"") "")
if err != nil { if err != nil {
return nil, fmt.Errorf("could not patch conenction pooler annotations %q: %v", patchData, err) return nil, fmt.Errorf("could not patch connection pooler annotations %q: %v", patchData, err)
} }
return result, nil return result, nil

10
pkg/cluster/sync.go
View File

@ -403,12 +403,12 @@ func (c *Cluster) syncStatefulSet() error {
// AnnotationsToPropagate get the annotations to update if required // AnnotationsToPropagate get the annotations to update if required
// based on the annotations in postgres CRD // based on the annotations in postgres CRD
func (c *Cluster) AnnotationsToPropagate(annotations map[string]string) map[string]string { func (c *Cluster) AnnotationsToPropagate(annotations map[string]string) map[string]string {
ToPropagateAnnotations := c.OpConfig.StatefulsetPropagateAnnotations toPropagateAnnotations := c.OpConfig.StatefulsetPropagateAnnotations
PgCRDAnnotations := c.Postgresql.ObjectMeta.GetAnnotations() pgCRDAnnotations := c.Postgresql.ObjectMeta.GetAnnotations()
if ToPropagateAnnotations != nil && PgCRDAnnotations != nil { if toPropagateAnnotations != nil && pgCRDAnnotations != nil {
for _, anno := range ToPropagateAnnotations { for _, anno := range toPropagateAnnotations {
for k, v := range PgCRDAnnotations { for k, v := range pgCRDAnnotations {
matched, err := regexp.MatchString(anno, k) matched, err := regexp.MatchString(anno, k)
if err != nil { if err != nil {
c.logger.Errorf("annotations matching issue: %v", err) c.logger.Errorf("annotations matching issue: %v", err)