From 8448e39d8d5278a12cd2bb4c4bbc923cff8875be Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Tue, 5 May 2020 12:13:37 +0200 Subject: [PATCH] update images for spilo, logical-backup and pooler --- .../postgres-operator-1.5.0.tgz | Bin 15833 -> 15843 bytes charts/postgres-operator/values-crd.yaml | 8 ++++---- charts/postgres-operator/values.yaml | 6 +++--- manifests/complete-postgres-manifest.yaml | 2 +- manifests/configmap.yaml | 2 +- ...gresql-operator-default-configuration.yaml | 4 ++-- pkg/controller/operator_config.go | 2 +- pkg/util/config/config.go | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charts/postgres-operator/postgres-operator-1.5.0.tgz b/charts/postgres-operator/postgres-operator-1.5.0.tgz index e0df862aae0600b17581c3fcc2e04c0b41040c36..f575f7cfd04c55f39bf421afd6ce0a63ddb654db 100644 GIT binary patch delta 15400 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 X*~Xt&5Cj+)2sB3E%?&064)%WmGcC;? delta 15400 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 C!S5RY diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml index 62d03e49f..4f57dd642 100644 --- a/charts/postgres-operator/values-crd.yaml +++ b/charts/postgres-operator/values-crd.yaml @@ -28,7 +28,7 @@ configGeneral: # Select if setup uses endpoints (default), or configmaps to manage leader (DCS=k8s) # kubernetes_use_configmaps: false # Spilo docker image - docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115 + docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p3 # max number of instances in Postgres cluster. -1 = no limit min_instances: -1 # min number of instances in Postgres cluster. -1 = no limit @@ -67,7 +67,7 @@ configKubernetes: # keya: valuea # keyb: valueb - # list of annotations propagated from cluster manifest to statefulset and deployment + # list of annotations propagated from cluster manifest to statefulset and deployment # downscaler_annotations: # - deployment-time # - downscaler/* @@ -214,7 +214,7 @@ configAwsOrGcp: # configure K8s cron job managed by the operator configLogicalBackup: # image for pods of the logical backup job (example runs pg_dumpall) - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:master-58" # S3 Access Key ID logical_backup_s3_access_key_id: "" # S3 bucket to store backup results @@ -265,7 +265,7 @@ configConnectionPooler: # db user for pooler to use connection_pooler_user: "pooler" # docker image - connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer" + connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-7" # max db connections the pooler should hold connection_pooler_max_db_connections: 60 # default pooling mode diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index 1c5538a9f..2a6a181f5 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -28,7 +28,7 @@ configGeneral: # Select if setup uses endpoints (default), or configmaps to manage leader (DCS=k8s) # kubernetes_use_configmaps: "false" # Spilo docker image - docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115 + docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p3 # max number of instances in Postgres cluster. -1 = no limit min_instances: "-1" # min number of instances in Postgres cluster. -1 = no limit @@ -203,7 +203,7 @@ configAwsOrGcp: # configure K8s cron job managed by the operator configLogicalBackup: # image for pods of the logical backup job (example runs pg_dumpall) - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:master-58" # S3 Access Key ID logical_backup_s3_access_key_id: "" # S3 bucket to store backup results @@ -257,7 +257,7 @@ configConnectionPooler: # db user for pooler to use connection_pooler_user: "pooler" # docker image - connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer" + connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-7" # max db connections the pooler should hold connection_pooler_max_db_connections: "60" # default pooling mode diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml index d436695e8..e626d6b26 100644 --- a/manifests/complete-postgres-manifest.yaml +++ b/manifests/complete-postgres-manifest.yaml @@ -7,7 +7,7 @@ metadata: # annotations: # "acid.zalan.do/controller": "second-operator" spec: - dockerImage: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115 + dockerImage: registry.opensource.zalan.do/acid/spilo-12:1.6-p3 teamId: "acid" numberOfInstances: 2 users: # Application/Robot users diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index 0a740e198..4314b41d3 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -29,7 +29,7 @@ data: # default_cpu_request: 100m # default_memory_limit: 500Mi # default_memory_request: 100Mi - docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115 + docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p3 # downscaler_annotations: "deployment-time,downscaler/*" # enable_admin_role_for_users: "true" # enable_crd_validation: "true" diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index 9ae1b3b26..049e917f6 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -3,7 +3,7 @@ kind: OperatorConfiguration metadata: name: postgresql-operator-default-configuration configuration: - docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115 + docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p3 # enable_crd_validation: true # enable_lazy_spilo_upgrade: false # enable_shm_volume: true @@ -92,7 +92,7 @@ configuration: # log_s3_bucket: "" # wal_s3_bucket: "" logical_backup: - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:master-58" # logical_backup_s3_access_key_id: "" logical_backup_s3_bucket: "my-bucket-url" # logical_backup_s3_endpoint: "" diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index 389240c09..41d701fe2 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -37,7 +37,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.EnableLazySpiloUpgrade = fromCRD.EnableLazySpiloUpgrade result.EtcdHost = fromCRD.EtcdHost result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps - result.DockerImage = util.Coalesce(fromCRD.DockerImage, "registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115") + result.DockerImage = util.Coalesce(fromCRD.DockerImage, "registry.opensource.zalan.do/acid/spilo-12:1.6-p3") result.Workers = fromCRD.Workers result.MinInstances = fromCRD.MinInstances result.MaxInstances = fromCRD.MaxInstances diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index d8c92ba3e..348452193 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -112,7 +112,7 @@ type Config struct { WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' KubernetesUseConfigMaps bool `name:"kubernetes_use_configmaps" default:"false"` EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS - DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115"` + DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-12:1.6-p3"` // deprecated in favour of SidecarContainers SidecarImages map[string]string `name:"sidecar_docker_images"` SidecarContainers []v1.Container `name:"sidecars"`