bump spilo to 16-3.3, drop support for pg11 (#2706)
* bump spilo to 16-3.3, drop support for pg11 * update README
This commit is contained in:
		
							parent
							
								
									e6ae9e3772
								
							
						
					
					
						commit
						85b8058029
					
				|  | @ -28,7 +28,7 @@ pipelines with no access to Kubernetes API directly, promoting infrastructure as | |||
| 
 | ||||
| ### PostgreSQL features | ||||
| 
 | ||||
| * Supports PostgreSQL 16, starting from 11+ | ||||
| * Supports PostgreSQL 16, starting from 12+ | ||||
| * Streaming replication cluster via Patroni | ||||
| * Point-In-Time-Recovery with | ||||
| [pg_basebackup](https://www.postgresql.org/docs/16/app-pgbasebackup.html) / | ||||
|  |  | |||
|  | @ -68,7 +68,7 @@ spec: | |||
|                   type: string | ||||
|               docker_image: | ||||
|                 type: string | ||||
|                 default: "ghcr.io/zalando/spilo-16:3.2-p3" | ||||
|                 default: "ghcr.io/zalando/spilo-16:3.3-p1" | ||||
|               enable_crd_registration: | ||||
|                 type: boolean | ||||
|                 default: true | ||||
|  |  | |||
|  | @ -375,7 +375,6 @@ spec: | |||
|                   version: | ||||
|                     type: string | ||||
|                     enum: | ||||
|                       - "11" | ||||
|                       - "12" | ||||
|                       - "13" | ||||
|                       - "14" | ||||
|  |  | |||
|  | @ -38,7 +38,7 @@ configGeneral: | |||
|   # etcd connection string for Patroni. Empty uses K8s-native DCS. | ||||
|   etcd_host: "" | ||||
|   # Spilo docker image | ||||
|   docker_image: ghcr.io/zalando/spilo-16:3.2-p3 | ||||
|   docker_image: ghcr.io/zalando/spilo-16:3.3-p1 | ||||
| 
 | ||||
|   # key name for annotation to ignore globally configured instance limits | ||||
|   # ignore_instance_limits_annotation_key: "" | ||||
|  |  | |||
|  | @ -10,7 +10,7 @@ metadata: | |||
| #    "delete-date": "2020-08-31"  # can only be deleted on that day if "delete-date "key is configured | ||||
| #    "delete-clustername": "acid-test-cluster"  # can only be deleted when name matches if "delete-clustername" key is configured | ||||
| spec: | ||||
|   dockerImage: ghcr.io/zalando/spilo-16:3.2-p3 | ||||
|   dockerImage: ghcr.io/zalando/spilo-16:3.3-p1 | ||||
|   teamId: "acid" | ||||
|   numberOfInstances: 2 | ||||
|   users:  # Application/Robot users | ||||
|  |  | |||
|  | @ -34,7 +34,7 @@ data: | |||
|   default_memory_request: 100Mi | ||||
|   # delete_annotation_date_key: delete-date | ||||
|   # delete_annotation_name_key: delete-clustername | ||||
|   docker_image: ghcr.io/zalando/spilo-16:3.2-p3 | ||||
|   docker_image: ghcr.io/zalando/spilo-16:3.3-p1 | ||||
|   # downscaler_annotations: "deployment-time,downscaler/*" | ||||
|   # enable_admin_role_for_users: "true" | ||||
|   # enable_crd_registration: "true" | ||||
|  |  | |||
|  | @ -66,7 +66,7 @@ spec: | |||
|                   type: string | ||||
|               docker_image: | ||||
|                 type: string | ||||
|                 default: "ghcr.io/zalando/spilo-16:3.2-p3" | ||||
|                 default: "ghcr.io/zalando/spilo-16:3.3-p1" | ||||
|               enable_crd_registration: | ||||
|                 type: boolean | ||||
|                 default: true | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ kind: OperatorConfiguration | |||
| metadata: | ||||
|   name: postgresql-operator-default-configuration | ||||
| configuration: | ||||
|   docker_image: ghcr.io/zalando/spilo-16:3.2-p3 | ||||
|   docker_image: ghcr.io/zalando/spilo-16:3.3-p1 | ||||
|   # enable_crd_registration: true | ||||
|   # crd_categories: | ||||
|   # - all | ||||
|  |  | |||
|  | @ -373,7 +373,6 @@ spec: | |||
|                   version: | ||||
|                     type: string | ||||
|                     enum: | ||||
|                       - "11" | ||||
|                       - "12" | ||||
|                       - "13" | ||||
|                       - "14" | ||||
|  |  | |||
|  | @ -595,9 +595,6 @@ var PostgresCRDResourceValidation = apiextv1.CustomResourceValidation{ | |||
| 							"version": { | ||||
| 								Type: "string", | ||||
| 								Enum: []apiextv1.JSON{ | ||||
| 									{ | ||||
| 										Raw: []byte(`"11"`), | ||||
| 									}, | ||||
| 									{ | ||||
| 										Raw: []byte(`"12"`), | ||||
| 									}, | ||||
|  |  | |||
|  | @ -11,7 +11,6 @@ import ( | |||
| 
 | ||||
| // VersionMap Map of version numbers
 | ||||
| var VersionMap = map[string]int{ | ||||
| 	"11": 110000, | ||||
| 	"12": 120000, | ||||
| 	"13": 130000, | ||||
| 	"14": 140000, | ||||
|  |  | |||
|  | @ -39,7 +39,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur | |||
| 	result.EnableTeamIdClusternamePrefix = fromCRD.EnableTeamIdClusternamePrefix | ||||
| 	result.EtcdHost = fromCRD.EtcdHost | ||||
| 	result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps | ||||
| 	result.DockerImage = util.Coalesce(fromCRD.DockerImage, "ghcr.io/zalando/spilo-16:3.2-p3") | ||||
| 	result.DockerImage = util.Coalesce(fromCRD.DockerImage, "ghcr.io/zalando/spilo-16:3.3-p1") | ||||
| 	result.Workers = util.CoalesceUInt32(fromCRD.Workers, 8) | ||||
| 	result.MinInstances = fromCRD.MinInstances | ||||
| 	result.MaxInstances = fromCRD.MaxInstances | ||||
|  |  | |||
|  | @ -174,7 +174,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:"ghcr.io/zalando/spilo-16:3.2-p3"` | ||||
| 	DockerImage             string            `name:"docker_image" default:"ghcr.io/zalando/spilo-16:3.3-p1"` | ||||
| 	SidecarImages           map[string]string `name:"sidecar_docker_images"` // deprecated in favour of SidecarContainers
 | ||||
| 	SidecarContainers       []v1.Container    `name:"sidecars"` | ||||
| 	PodServiceAccountName   string            `name:"pod_service_account_name" default:"postgres-pod"` | ||||
|  |  | |||
|  | @ -305,7 +305,7 @@ def read_versions( | |||
|         if uid == 'wal' or defaulting(lambda: UUID(uid)) | ||||
|     ] | ||||
| 
 | ||||
| BACKUP_VERSION_PREFIXES = ['', '9.6/', '10/', '11/', '12/', '13/', '14/', '15/', '16/'] | ||||
| BACKUP_VERSION_PREFIXES = ['', '10/', '11/', '12/', '13/', '14/', '15/', '16/'] | ||||
| 
 | ||||
| def read_basebackups( | ||||
|     pg_cluster, | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue