bump operator v1.3.0 with Spilo 12 image (zalando#770)

FxKu · web-flow · commit 7af1de890cba · 2019-12-17T17:13:56.000+01:00
diff --git a/charts/postgres-operator/Chart.yaml b/charts/postgres-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: postgres-operator
-version: 1.2.0
-appVersion: 1.2.0
+version: 1.3.0
+appVersion: 1.3.0
 home: https://github.com/zalando/postgres-operator
 description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
 keywords:
@@ -13,8 +13,6 @@ keywords:
 maintainers:
 - name: Zalando
   email: opensource@zalando.de
-- name: kimxogus
-  email: kgyoo8232@gmail.com
 sources:
 - https://github.com/zalando/postgres-operator
 engine: gotpl
diff --git a/charts/postgres-operator/index.yaml b/charts/postgres-operator/index.yaml
@@ -1,13 +1,34 @@
 apiVersion: v1
 entries:
   postgres-operator:
+  - apiVersion: v1
+    appVersion: 1.3.0
+    created: "2019-12-17T12:58:49.477140129+01:00"
+    description: Postgres Operator creates and manages PostgreSQL clusters running
+      in Kubernetes
+    digest: 7e788fd37daec76a01f6d6f9fe5be5b54f5035e4eba0041e80a760d656537325
+    home: https://github.com/zalando/postgres-operator
+    keywords:
+    - postgres
+    - operator
+    - cloud-native
+    - patroni
+    - spilo
+    maintainers:
+    - email: opensource@zalando.de
+      name: Zalando
+    name: postgres-operator
+    sources:
+    - https://github.com/zalando/postgres-operator
+    urls:
+    - postgres-operator-1.3.0.tgz
+    version: 1.3.0
   - apiVersion: v1
     appVersion: 1.2.0
-    created: "2019-08-13T17:33:32.735021423+02:00"
+    created: "2019-12-17T12:58:49.475844233+01:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running
       in Kubernetes
     digest: d10710c7cf19f4e266e7704f5d1e98dcfc61bee3919522326c35c22ca7d2f2bf
-    engine: gotpl
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -26,4 +47,4 @@ entries:
     urls:
     - postgres-operator-1.2.0.tgz
     version: 1.2.0
-generated: "2019-08-13T17:33:32.734335398+02:00"
+generated: "2019-12-17T12:58:49.474719294+01:00"
diff --git a/charts/postgres-operator/postgres-operator-1.3.0.tgz b/charts/postgres-operator/postgres-operator-1.3.0.tgz
diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml
@@ -1,7 +1,7 @@
 image:
   registry: registry.opensource.zalan.do
   repository: acid/postgres-operator
-  tag: v1.2.0
+  tag: v1.3.0
   pullPolicy: "IfNotPresent"
 
 # Optionally specify an array of imagePullSecrets.
@@ -24,7 +24,7 @@ configGeneral:
   # etcd connection string for Patroni. Empty uses K8s-native DCS.
   etcd_host: ""
   # Spilo docker image
-  docker_image: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
+  docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16
   # max number of instances in Postgres cluster. -1 = no limit
   min_instances: -1
   # min number of instances in Postgres cluster. -1 = no limit
diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml
@@ -1,7 +1,7 @@
 image:
   registry: registry.opensource.zalan.do
   repository: acid/postgres-operator
-  tag: v1.2.0
+  tag: v1.3.0
   pullPolicy: "IfNotPresent"
 
 # Optionally specify an array of imagePullSecrets.
@@ -24,7 +24,7 @@ configGeneral:
   # etcd connection string for Patroni. Empty uses K8s-native DCS.
   etcd_host: ""
   # Spilo docker image
-  docker_image: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
+  docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16
   # max number of instances in Postgres cluster. -1 = no limit
   min_instances: "-1"
   # min number of instances in Postgres cluster. -1 = no limit
diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml
@@ -5,7 +5,7 @@ metadata:
 #  labels:
 #    environment: demo
 spec:
-  dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
+  dockerImage: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16
   teamId: "acid"
   volume:
     size: 1Gi
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
@@ -19,7 +19,7 @@ data:
   # default_cpu_request: 100m
   # default_memory_limit: 1Gi
   # default_memory_request: 100Mi
-  docker_image: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
+  docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16
   # enable_admin_role_for_users: "true"
   # enable_crd_validation: "true"
   # enable_database_access: "true"
diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: zalando-postgres-operator
       containers:
       - name: postgres-operator
-        image: registry.opensource.zalan.do/acid/postgres-operator:v1.2.0
+        image: registry.opensource.zalan.do/acid/postgres-operator:v1.3.0
         imagePullPolicy: IfNotPresent
         resources:
           requests:
diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml
@@ -5,7 +5,7 @@ metadata:
 configuration:
   # enable_crd_validation: true
   etcd_host: ""
-  docker_image: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
+  docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16
   # enable_shm_volume: true
   max_instances: -1
   min_instances: -1
diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go
@@ -90,7 +90,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'
 	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-11:1.6-p1"`
+	DockerImage      string            `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16"`
 	Sidecars         map[string]string `name:"sidecar_docker_images"`
 	// default name `operator` enables backward compatibility with the older ServiceAccountName field
 	PodServiceAccountName string `name:"pod_service_account_name" default:"operator"`
