Skip to content

Commit 121e8bb

Browse files
horshors
authored
Merge branch 'main' into K8SPG-837
2 parents 982b12e + 7f6a255 commit 121e8bb

File tree

5 files changed

+144
-140
lines changed

5 files changed

+144
-140
lines changed

‎e2e-tests/tests/upgrade-consistency/01-create-cluster.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ commands:
88
99
source ../../functions
1010
11+
cr_version="2.6.0"
1112
get_cr \
12-
| yq eval '.spec.crVersion="2.6.0"' - \
13-
| yq eval ".spec.image=\"${IMAGE_BASE}:main-ppg$PG_VER-postgres\"" - \
14-
| yq eval ".spec.backups.pgbackrest.image=\"${IMAGE_BASE}:main-ppg$PG_VER-pgbackrest\"" - \
13+
| yq eval ".spec.crVersion=\"$cr_version\"" - \
14+
| yq eval ".spec.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-postgres\"" - \
15+
| yq eval ".spec.backups.pgbackrest.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-pgbackrest\"" - \
16+
| yq eval ".spec.proxy.pgBouncer.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-pgbouncer\"" - \
1517
| kubectl -n "${NAMESPACE}" apply -f -

‎e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ commands:
88
99
source ../../functions
1010
11+
cr_version="2.7.0"
1112
get_cr \
12-
| yq eval '
13-
.spec.crVersion="2.7.0"' - \
14-
| yq eval ".spec.image=\"${IMAGE_BASE}:main-ppg$PG_VER-postgres\"" - \
13+
| yq eval ".spec.crVersion=\"$cr_version\"" - \ - \
14+
| yq eval ".spec.image=\"${IMAGE_BASE}:pg-operator-$cr_version-ppg$PG_VER-postgres\"" - \
15+
| yq eval ".spec.backups.pgbackrest.image=\"${IMAGE_BASE}:pg-operator-$cr_version-pgbackrest$PG_VER\"" - \
16+
| yq eval ".spec.proxy.pgBouncer.image=\"${IMAGE_BASE}:pg-operator-$cr_version-pgbouncer$PG_VER\"" - \
1517
| kubectl -n "${NAMESPACE}" apply -f -
1618
1719
sleep 10

‎e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ commands:
88
99
source ../../functions
1010
11+
cr_version="2.8.0"
1112
get_cr \
12-
| yq eval '
13-
.spec.crVersion="2.8.0"' - \
13+
| yq eval ".spec.crVersion=\"$cr_version\"" - \
14+
| yq eval ".spec.image=\"${IMAGE_BASE}:main-ppg$PG_VER-postgres\"" - \
15+
| yq eval ".spec.backups.pgbackrest.image=\"${IMAGE_BASE}:main-pgbackrest$PG_VER\"" - \
16+
| yq eval ".spec.proxy.pgBouncer.image=\"${IMAGE_BASE}:main-pgbouncer$PG_VER\"" - \
1417
| kubectl -n "${NAMESPACE}" apply -f -
1518
1619
sleep 10

‎go.mod‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ go 1.25.1
55
require (
66
github.com/Percona-Lab/percona-version-service v0.0.0-20230404081016-ea25e30cdcbc
77
github.com/go-logr/logr v1.4.3
8-
github.com/go-openapi/errors v0.22.2
9-
github.com/go-openapi/runtime v0.28.0
10-
github.com/go-openapi/strfmt v0.23.0
8+
github.com/go-openapi/errors v0.22.3
9+
github.com/go-openapi/runtime v0.29.0
10+
github.com/go-openapi/strfmt v0.24.0
1111
github.com/go-openapi/swag v0.25.0
12-
github.com/go-openapi/validate v0.24.0
12+
github.com/go-openapi/validate v0.25.0
1313
github.com/google/go-cmp v0.7.0
1414
github.com/google/uuid v1.6.0
1515
github.com/hashicorp/go-version v1.7.0
@@ -21,53 +21,54 @@ require (
2121
github.com/sirupsen/logrus v1.9.3
2222
github.com/xdg-go/stringprep v1.0.4
2323
go.nhat.io/grpcmock v0.32.0
24-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
24+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
2525
go.opentelemetry.io/otel v1.38.0
26-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0
27-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.37.0
28-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.37.0
29-
go.opentelemetry.io/otel/sdk v1.37.0
26+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
27+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0
28+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0
29+
go.opentelemetry.io/otel/sdk v1.38.0
3030
go.opentelemetry.io/otel/trace v1.38.0
3131
go.uber.org/zap v1.27.0
32-
golang.org/x/crypto v0.41.0
32+
golang.org/x/crypto v0.42.0
3333
google.golang.org/grpc v1.75.1
3434
gotest.tools/v3 v3.5.2
3535
k8s.io/api v0.34.1
3636
k8s.io/apimachinery v0.34.1
3737
k8s.io/client-go v0.34.1
38-
k8s.io/component-base v0.33.4
38+
k8s.io/component-base v0.34.1
3939
sigs.k8s.io/controller-runtime v0.21.0
4040
sigs.k8s.io/yaml v1.6.0
4141
)
4242

4343
require (
4444
github.com/Masterminds/semver/v3 v3.4.0 // indirect
45-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
45+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4646
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4747
github.com/fsnotify/fsnotify v1.9.0 // indirect
4848
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4949
github.com/go-openapi/swag/cmdutils v0.25.0 // indirect
50-
github.com/go-openapi/swag/conv v0.25.0 // indirect
51-
github.com/go-openapi/swag/fileutils v0.25.0 // indirect
52-
github.com/go-openapi/swag/jsonname v0.25.0 // indirect
53-
github.com/go-openapi/swag/jsonutils v0.25.0 // indirect
54-
github.com/go-openapi/swag/loading v0.25.0 // indirect
55-
github.com/go-openapi/swag/mangling v0.25.0 // indirect
50+
github.com/go-openapi/swag/conv v0.25.1 // indirect
51+
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
52+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
53+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
54+
github.com/go-openapi/swag/loading v0.25.1 // indirect
55+
github.com/go-openapi/swag/mangling v0.25.1 // indirect
5656
github.com/go-openapi/swag/netutils v0.25.0 // indirect
57-
github.com/go-openapi/swag/stringutils v0.25.0 // indirect
58-
github.com/go-openapi/swag/typeutils v0.25.0 // indirect
59-
github.com/go-openapi/swag/yamlutils v0.25.0 // indirect
57+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
58+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
59+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
6060
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
61+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
6162
github.com/google/btree v1.1.3 // indirect
6263
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
6364
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
6465
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6566
github.com/x448/float16 v0.8.4 // indirect
66-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
67+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
6768
go.uber.org/automaxprocs v1.6.0 // indirect
6869
go.yaml.in/yaml/v2 v2.4.2 // indirect
6970
go.yaml.in/yaml/v3 v3.0.4 // indirect
70-
golang.org/x/mod v0.27.0 // indirect
71+
golang.org/x/mod v0.28.0 // indirect
7172
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7273
sigs.k8s.io/randfill v1.0.0 // indirect
7374
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
@@ -85,11 +86,11 @@ require (
8586
github.com/felixge/httpsnoop v1.0.4 // indirect
8687
github.com/go-logr/stdr v1.2.2 // indirect
8788
github.com/go-logr/zapr v1.3.0 // indirect
88-
github.com/go-openapi/analysis v0.23.0 // indirect
89-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
90-
github.com/go-openapi/jsonreference v0.21.0 // indirect
91-
github.com/go-openapi/loads v0.22.0 // indirect
92-
github.com/go-openapi/spec v0.21.0 // indirect
89+
github.com/go-openapi/analysis v0.24.0 // indirect
90+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
91+
github.com/go-openapi/jsonreference v0.21.2 // indirect
92+
github.com/go-openapi/loads v0.23.1 // indirect
93+
github.com/go-openapi/spec v0.22.0 // indirect
9394
github.com/gogo/protobuf v1.3.2 // indirect
9495
github.com/golang-jwt/jwt/v5 v5.3.0
9596
github.com/golang/protobuf v1.5.4 // indirect
@@ -99,13 +100,11 @@ require (
99100
github.com/iancoleman/orderedmap v0.3.0 // indirect
100101
github.com/jmespath/go-jmespath v0.4.0 // indirect
101102
github.com/json-iterator/go v1.1.12 // indirect
102-
github.com/mitchellh/mapstructure v1.5.0 // indirect
103103
github.com/moby/spdystream v0.5.0 // indirect
104104
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
105105
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
106106
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
107107
github.com/oklog/ulid v1.3.1 // indirect
108-
github.com/opentracing/opentracing-go v1.2.0 // indirect
109108
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
110109
github.com/prometheus/client_golang v1.22.0 // indirect
111110
github.com/prometheus/client_model v0.6.1 // indirect
@@ -119,27 +118,27 @@ require (
119118
github.com/swaggest/assertjson v1.9.0 // indirect
120119
github.com/yudai/gojsondiff v1.0.0 // indirect
121120
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
122-
go.mongodb.org/mongo-driver v1.14.0 // indirect
121+
go.mongodb.org/mongo-driver v1.17.4 // indirect
123122
go.nhat.io/matcher/v2 v2.0.0 // indirect
124123
go.nhat.io/wait v0.1.0 // indirect
125124
go.opentelemetry.io/otel/metric v1.38.0 // indirect
126-
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
125+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
127126
go.uber.org/multierr v1.11.0 // indirect
128-
golang.org/x/net v0.43.0 // indirect
127+
golang.org/x/net v0.44.0 // indirect
129128
golang.org/x/oauth2 v0.30.0 // indirect
130-
golang.org/x/sync v0.16.0 // indirect
131-
golang.org/x/sys v0.35.0 // indirect
132-
golang.org/x/term v0.34.0 // indirect
133-
golang.org/x/text v0.28.0 // indirect
129+
golang.org/x/sync v0.17.0 // indirect
130+
golang.org/x/sys v0.36.0 // indirect
131+
golang.org/x/term v0.35.0 // indirect
132+
golang.org/x/text v0.29.0 // indirect
134133
golang.org/x/time v0.9.0 // indirect
135-
golang.org/x/tools v0.36.0
134+
golang.org/x/tools v0.37.0
136135
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
137-
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
138-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
139-
google.golang.org/protobuf v1.36.7 // indirect
136+
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
137+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
138+
google.golang.org/protobuf v1.36.8 // indirect
140139
gopkg.in/inf.v0 v0.9.1 // indirect
141140
gopkg.in/yaml.v3 v3.0.1 // indirect
142-
k8s.io/apiextensions-apiserver v0.33.4
141+
k8s.io/apiextensions-apiserver v0.34.1
143142
k8s.io/klog/v2 v2.130.1 // indirect
144143
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
145144
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397

0 commit comments

Comments
 (0)