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.

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

K8SPG-648 add PG17 support #921

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: pgupgrades.postgres-operator.crunchydata.com
spec:
group: postgres-operator.crunchydata.com
Expand Down Expand Up @@ -964,7 +964,7 @@ spec:
fromPostgresVersion:
description: The major version of PostgreSQL before the upgrade.
maximum: 17
minimum: 10
minimum: 12
type: integer
image:
description: The image name to use for major PostgreSQL upgrades.
Expand Down Expand Up @@ -2513,7 +2513,7 @@ spec:
toPostgresVersion:
description: The major version of PostgreSQL to be upgraded to.
maximum: 17
minimum: 10
minimum: 13
type: integer
tolerations:
description: |-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: postgresclusters.postgres-operator.crunchydata.com
spec:
group: postgres-operator.crunchydata.com
Expand Down Expand Up @@ -14096,7 +14096,7 @@ spec:
description: The major version of PostgreSQL installed in the PostgreSQL
image
maximum: 17
minimum: 10
minimum: 12
type: integer
proxy:
description: The specification of a proxy that connects to PostgreSQL.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: perconapgbackups.pgv2.percona.com
spec:
group: pgv2.percona.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: perconapgclusters.pgv2.percona.com
spec:
group: pgv2.percona.com
Expand Down Expand Up @@ -13709,7 +13709,7 @@ spec:
postgresVersion:
description: The major version of PostgreSQL installed in the PostgreSQL
image
maximum: 16
maximum: 17
minimum: 12
type: integer
proxy:
Expand Down Expand Up @@ -17494,6 +17494,8 @@ spec:
properties:
host:
type: string
patroniVersion:
type: string
pgbouncer:
properties:
ready:
Expand Down Expand Up @@ -17531,17 +17533,11 @@ spec:
size:
format: int32
type: integer
required:
- instances
- ready
- size
version:
type: integer
type: object
state:
type: string
required:
- pgbouncer
- postgres
- state
type: object
required:
- metadata
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: perconapgrestores.pgv2.percona.com
spec:
group: pgv2.percona.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: perconapgupgrades.pgv2.percona.com
spec:
group: pgv2.percona.com
Expand Down Expand Up @@ -2515,7 +2515,7 @@ spec:
type: string
toPostgresVersion:
description: The major version of PostgreSQL to be upgraded to.
maximum: 16
maximum: 17
minimum: 13
type: integer
tolerations:
Expand Down
2 changes: 0 additions & 2 deletions cmd/postgres-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"

//"github.com/percona/percona-postgresql-operator/internal/controller/pgupgrade"

"github.com/percona/percona-postgresql-operator/internal/controller/pgupgrade"
"github.com/percona/percona-postgresql-operator/internal/controller/postgrescluster"
"github.com/percona/percona-postgresql-operator/internal/controller/runtime"
Expand Down
24 changes: 10 additions & 14 deletions config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: perconapgbackups.pgv2.percona.com
spec:
group: pgv2.percona.com
Expand Down Expand Up @@ -409,7 +409,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: perconapgclusters.pgv2.percona.com
spec:
group: pgv2.percona.com
Expand Down Expand Up @@ -14115,7 +14115,7 @@ spec:
postgresVersion:
description: The major version of PostgreSQL installed in the PostgreSQL
image
maximum: 16
maximum: 17
minimum: 12
type: integer
proxy:
Expand Down Expand Up @@ -17900,6 +17900,8 @@ spec:
properties:
host:
type: string
patroniVersion:
type: string
pgbouncer:
properties:
ready:
Expand Down Expand Up @@ -17937,17 +17939,11 @@ spec:
size:
format: int32
type: integer
required:
- instances
- ready
- size
version:
type: integer
type: object
state:
type: string
required:
- pgbouncer
- postgres
- state
type: object
required:
- metadata
Expand All @@ -17962,7 +17958,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: perconapgrestores.pgv2.percona.com
spec:
group: pgv2.percona.com
Expand Down Expand Up @@ -18060,7 +18056,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
name: perconapgupgrades.pgv2.percona.com
spec:
group: pgv2.percona.com
Expand Down Expand Up @@ -20572,7 +20568,7 @@ spec:
type: string
toPostgresVersion:
description: The major version of PostgreSQL to be upgraded to.
maximum: 16
maximum: 17
minimum: 13
type: integer
tolerations:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
labels:
app.kubernetes.io/name: pgo
app.kubernetes.io/version: latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
labels:
app.kubernetes.io/name: pgo
app.kubernetes.io/version: latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
labels:
app.kubernetes.io/name: pgo
app.kubernetes.io/version: latest
Expand Down Expand Up @@ -966,7 +966,7 @@ spec:
fromPostgresVersion:
description: The major version of PostgreSQL before the upgrade.
maximum: 17
minimum: 10
minimum: 12
type: integer
image:
description: The image name to use for major PostgreSQL upgrades.
Expand Down Expand Up @@ -2510,7 +2510,7 @@ spec:
toPostgresVersion:
description: The major version of PostgreSQL to be upgraded to.
maximum: 17
minimum: 10
minimum: 13
type: integer
tolerations:
description: |-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.16.5
labels:
app.kubernetes.io/name: pgo
app.kubernetes.io/version: 5.4.2
Expand Down Expand Up @@ -14038,7 +14038,7 @@ spec:
description: The major version of PostgreSQL installed in the PostgreSQL
image
maximum: 17
minimum: 10
minimum: 12
type: integer
proxy:
description: The specification of a proxy that connects to PostgreSQL.
Expand Down
18 changes: 8 additions & 10 deletions config/rbac/cluster/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ rules:
resources:
- configmaps
- persistentvolumeclaims
- pods
- secrets
- serviceaccounts
- services
Expand Down Expand Up @@ -46,16 +47,6 @@ rules:
verbs:
- create
- patch
- apiGroups:
- ''
resources:
- pods
verbs:
- delete
- get
- list
- patch
- watch
- apiGroups:
- apps
resources:
Expand Down Expand Up @@ -158,6 +149,13 @@ rules:
- get
- list
- watch
- apiGroups:
- pgv2.percona.com
resources:
- pods
verbs:
- create
- delete
- apiGroups:
- policy
resources:
Expand Down
18 changes: 8 additions & 10 deletions config/rbac/namespace/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ rules:
resources:
- configmaps
- persistentvolumeclaims
- pods
- secrets
- serviceaccounts
- services
Expand Down Expand Up @@ -46,16 +47,6 @@ rules:
verbs:
- create
- patch
- apiGroups:
- ''
resources:
- pods
verbs:
- delete
- get
- list
- patch
- watch
- apiGroups:
- apps
resources:
Expand Down Expand Up @@ -158,6 +149,13 @@ rules:
- get
- list
- watch
- apiGroups:
- pgv2.percona.com
resources:
- pods
verbs:
- create
- delete
- apiGroups:
- policy
resources:
Expand Down
Loading
Loading