Skip to content

Commit 0db4a12

Browse files
pooknullpooknull
authored
Merge branch 'main' into K8SPG-873
2 parents a13a2f4 + 74508f2 commit 0db4a12

File tree

237 files changed

+1123
-862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+1123
-862
lines changed

‎.golangci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ linters:
5454
desc: Should be used only in tests.
5555
- pkg: testing/*
5656
desc: The "testing" packages should be used only in tests.
57-
- pkg: github.com/percona/percona-postgresql-operator/internal/testing/*
57+
- pkg: github.com/percona/percona-postgresql-operator/v2/internal/testing/*
5858
desc: The "internal/testing" packages should be used only in tests.
5959
tests:
6060
files:

‎Jenkinsfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ void createCluster(String CLUSTER_SUFFIX) {
1616
--preemptible \
1717
--zone=${region} \
1818
--machine-type='n1-standard-4' \
19-
--cluster-version='1.30' \
19+
--cluster-version='1.31' \
2020
--num-nodes=3 \
2121
--labels='delete-cluster-after-hours=6' \
2222
--disk-size=30 \
@@ -498,7 +498,7 @@ pipeline {
498498
-e GO111MODULE=on \
499499
golang:1.25.1 sh -c '
500500
go install github.com/google/go-licenses@latest;
501-
/go/bin/go-licenses csv github.com/percona/percona-postgresql-operator/cmd/postgres-operator \
501+
/go/bin/go-licenses csv github.com/percona/percona-postgresql-operator/v2/cmd/postgres-operator \
502502
| cut -d , -f 3 \
503503
| sort -u \
504504
> go-licenses-new || :

‎Makefile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,12 +448,13 @@ PG_VER ?= $(shell grep -o "postgresVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+"
448448
include e2e-tests/release_versions
449449
release: generate
450450
$(SED) -i \
451-
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
452-
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
453-
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
454-
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" \
455-
-e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_OPERATOR)#}" \
456-
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
451+
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
452+
-e "/^spec:/,/^ image:/{/^#/! s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
453+
-e "s| image: docker.io/perconalab/percona-postgresql-operator:main| image: $(IMAGE)|" \
454+
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
455+
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" \
456+
-e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_OPERATOR)#}" \
457+
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
457458
$(SED) -i -r "/Version *= \"[0-9]+\.[0-9]+\.[0-9]+\"$$/ s/[0-9]+\.[0-9]+\.[0-9]+/$(VERSION)/" pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
458459
$(SED) -i \
459460
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_UPGRADE)#}" \

‎build/crd/crunchy/generated/postgres-operator.crunchydata.com_postgresclusters.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7354,6 +7354,9 @@ spec:
73547354
required:
73557355
- volumeSnapshotClassName
73567356
type: object
7357+
trackLatestRestorableTime:
7358+
description: Enable tracking latest restorable time
7359+
type: boolean
73577360
type: object
73587361
config:
73597362
properties:

‎build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10926,11 +10926,11 @@ spec:
1092610926
bucket:
1092710927
type: string
1092810928
disableSSL:
10929-
type: string
10929+
type: boolean
1093010930
endpoint:
1093110931
type: string
1093210932
forcePathStyle:
10933-
type: string
10933+
type: boolean
1093410934
region:
1093510935
type: string
1093610936
secret:

‎cmd/extension-installer/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88
"path"
99

10-
"github.com/percona/percona-postgresql-operator/percona/extensions"
10+
"github.com/percona/percona-postgresql-operator/v2/percona/extensions"
1111
)
1212

1313
func main() {

‎cmd/postgres-operator/main.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@ import (
2727
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2828
"sigs.k8s.io/controller-runtime/pkg/manager"
2929

30-
"github.com/percona/percona-postgresql-operator/internal/controller/pgupgrade"
31-
"github.com/percona/percona-postgresql-operator/internal/controller/postgrescluster"
32-
"github.com/percona/percona-postgresql-operator/internal/controller/runtime"
33-
"github.com/percona/percona-postgresql-operator/internal/controller/standalone_pgadmin"
34-
"github.com/percona/percona-postgresql-operator/internal/feature"
35-
"github.com/percona/percona-postgresql-operator/internal/initialize"
36-
"github.com/percona/percona-postgresql-operator/internal/logging"
37-
"github.com/percona/percona-postgresql-operator/internal/naming"
38-
"github.com/percona/percona-postgresql-operator/internal/upgradecheck"
39-
perconaController "github.com/percona/percona-postgresql-operator/percona/controller"
40-
"github.com/percona/percona-postgresql-operator/percona/controller/pgbackup"
41-
"github.com/percona/percona-postgresql-operator/percona/controller/pgcluster"
42-
"github.com/percona/percona-postgresql-operator/percona/controller/pgrestore"
43-
perconaPGUpgrade "github.com/percona/percona-postgresql-operator/percona/controller/pgupgrade"
44-
perconaRuntime "github.com/percona/percona-postgresql-operator/percona/runtime"
45-
"github.com/percona/percona-postgresql-operator/percona/utils/registry"
46-
v2 "github.com/percona/percona-postgresql-operator/pkg/apis/pgv2.percona.com/v2"
47-
"github.com/percona/percona-postgresql-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
30+
"github.com/percona/percona-postgresql-operator/v2/internal/controller/pgupgrade"
31+
"github.com/percona/percona-postgresql-operator/v2/internal/controller/postgrescluster"
32+
"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
33+
"github.com/percona/percona-postgresql-operator/v2/internal/controller/standalone_pgadmin"
34+
"github.com/percona/percona-postgresql-operator/v2/internal/feature"
35+
"github.com/percona/percona-postgresql-operator/v2/internal/initialize"
36+
"github.com/percona/percona-postgresql-operator/v2/internal/logging"
37+
"github.com/percona/percona-postgresql-operator/v2/internal/naming"
38+
"github.com/percona/percona-postgresql-operator/v2/internal/upgradecheck"
39+
perconaController "github.com/percona/percona-postgresql-operator/v2/percona/controller"
40+
"github.com/percona/percona-postgresql-operator/v2/percona/controller/pgbackup"
41+
"github.com/percona/percona-postgresql-operator/v2/percona/controller/pgcluster"
42+
"github.com/percona/percona-postgresql-operator/v2/percona/controller/pgrestore"
43+
perconaPGUpgrade "github.com/percona/percona-postgresql-operator/v2/percona/controller/pgupgrade"
44+
perconaRuntime "github.com/percona/percona-postgresql-operator/v2/percona/runtime"
45+
"github.com/percona/percona-postgresql-operator/v2/percona/utils/registry"
46+
v2 "github.com/percona/percona-postgresql-operator/v2/pkg/apis/pgv2.percona.com/v2"
47+
"github.com/percona/percona-postgresql-operator/v2/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
4848
)
4949

5050
var (

‎config/crd/bases/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11538,11 +11538,11 @@ spec:
1153811538
bucket:
1153911539
type: string
1154011540
disableSSL:
11541-
type: string
11541+
type: boolean
1154211542
endpoint:
1154311543
type: string
1154411544
forcePathStyle:
11545-
type: string
11545+
type: boolean
1154611546
region:
1154711547
type: string
1154811548
secret:

‎config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7344,6 +7344,9 @@ spec:
73447344
required:
73457345
- volumeSnapshotClassName
73467346
type: object
7347+
trackLatestRestorableTime:
7348+
description: Enable tracking latest restorable time
7349+
type: boolean
73477350
type: object
73487351
config:
73497352
properties:

‎deploy/bundle.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11835,11 +11835,11 @@ spec:
1183511835
bucket:
1183611836
type: string
1183711837
disableSSL:
11838-
type: string
11838+
type: boolean
1183911839
endpoint:
1184011840
type: string
1184111841
forcePathStyle:
11842-
type: string
11842+
type: boolean
1184311843
region:
1184411844
type: string
1184511845
secret:
@@ -38174,6 +38174,9 @@ spec:
3817438174
required:
3817538175
- volumeSnapshotClassName
3817638176
type: object
38177+
trackLatestRestorableTime:
38178+
description: Enable tracking latest restorable time
38179+
type: boolean
3817738180
type: object
3817838181
config:
3817938182
properties:

0 commit comments

Comments
 (0)