Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add initial changes for PG16 compatibility and pgMonitor 4.10.0 bump #3737

Merged
merged 2 commits into from
Oct 3, 2023
Merged

add initial changes for PG16 compatibility and pgMonitor 4.10.0 bump #3737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
762d9b4
add initial changes for PG16 compatibility and pgMonitor 4.10.0 bump
dsessler7 Sep 29, 2023
2da0d31
Create and use a schema in kuttl tests to work around the change to C…
dsessler7 Oct 2, 2023
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
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PGO_IMAGE_URL ?= https://www.crunchydata.com/products/crunchy-postgresql-for-kub
PGO_IMAGE_PREFIX ?= localhost

PGMONITOR_DIR ?= hack/tools/pgmonitor
PGMONITOR_VERSION ?= v4.9.0
PGMONITOR_VERSION ?= v4.10.0
QUERIES_CONFIG_DIR ?= hack/tools/queries

# Buildah's "build" used to be "bud". Use the alias to be compatible for a while.
Expand Down Expand Up @@ -233,6 +233,7 @@ generate-kuttl: ## Generate kuttl tests
[ ! -d testing/kuttl/e2e-generated-other ] || rm -r testing/kuttl/e2e-generated-other
bash -ceu ' \
case $(KUTTL_PG_VERSION) in \
16 ) export KUTTL_BITNAMI_IMAGE_TAG=16.0.0-debian-11-r3 ;; \
15 ) export KUTTL_BITNAMI_IMAGE_TAG=15.0.0-debian-11-r4 ;; \
14 ) export KUTTL_BITNAMI_IMAGE_TAG=14.5.0-debian-11-r37 ;; \
13 ) export KUTTL_BITNAMI_IMAGE_TAG=13.8.0-debian-11-r39 ;; \
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/postgres-operator.crunchydata.com_pgupgrades.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ spec:
type: object
fromPostgresVersion:
description: The major version of PostgreSQL before the upgrade.
maximum: 15
maximum: 16
minimum: 10
type: integer
image:
Expand Down Expand Up @@ -937,7 +937,7 @@ spec:
type: string
toPostgresVersion:
description: The major version of PostgreSQL to be upgraded to.
maximum: 15
maximum: 16
minimum: 10
type: integer
tolerations:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10471,7 +10471,7 @@ spec:
postgresVersion:
description: The major version of PostgreSQL installed in the PostgreSQL
image
maximum: 15
maximum: 16
minimum: 10
type: integer
proxy:
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/postgres-operator.crunchydata.com/v1beta1/pgupgrade_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ type PGUpgradeSpec struct {
// The major version of PostgreSQL before the upgrade.
// +kubebuilder:validation:Required
// +kubebuilder:validation:Minimum=10
// +kubebuilder:validation:Maximum=15
// +kubebuilder:validation:Maximum=16
FromPostgresVersion int `json:"fromPostgresVersion"`

// TODO(benjaminjb): define webhook validation to make sure
Expand All @@ -70,7 +70,7 @@ type PGUpgradeSpec struct {
// The major version of PostgreSQL to be upgraded to.
// +kubebuilder:validation:Required
// +kubebuilder:validation:Minimum=10
// +kubebuilder:validation:Maximum=15
// +kubebuilder:validation:Maximum=16
ToPostgresVersion int `json:"toPostgresVersion"`

// The image name to use for PostgreSQL containers after upgrade.
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/postgres-operator.crunchydata.com/v1beta1/postgrescluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ type PostgresClusterSpec struct {
// The major version of PostgreSQL installed in the PostgreSQL image
// +kubebuilder:validation:Required
// +kubebuilder:validation:Minimum=10
// +kubebuilder:validation:Maximum=15
// +kubebuilder:validation:Maximum=16
// +operator-sdk:csv:customresourcedefinitions:type=spec,order=1
PostgresVersion int `json:"postgresVersion"`

Expand Down