Skip to content

Commit 4cfb027

Browse files
horshors
authored
Merge branch 'main' into K8SPG-628
2 parents 347b1d8 + 6162390 commit 4cfb027

24 files changed

+2370
-1236
lines changed

‎.github/linters/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module linters
22

3-
go 1.20
3+
go 1.23.4

‎.github/workflows/reviewdog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
steps:
88
- uses: actions/setup-go@v5
99
with:
10-
go-version: '^1.22'
10+
go-version: '^1.23'
1111
- uses: actions/checkout@v4
1212
- name: golangci-lint
1313
uses: golangci/golangci-lint-action@v6
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v4
3434
- uses: actions/setup-go@v5
3535
with:
36-
go-version: '^1.22'
36+
go-version: '^1.23'
3737
- run: go install mvdan.cc/sh/v3/cmd/shfmt@latest
3838
- run: $(go env GOPATH)/bin/shfmt -bn -ci -s -w .
3939
- name: suggester / shfmt

‎.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
- name: Setup Go
1111
uses: actions/setup-go@v5
1212
with:
13-
go-version: '^1.20'
13+
go-version: '^1.23'
1414
- uses: actions/checkout@v4
1515
- name: Basic tests
1616
run: make check
1717
- name: envtest
18-
run: ENVTEST_K8S_VERSION=1.26 make check-envtest
18+
run: ENVTEST_K8S_VERSION=1.28 make check-envtest

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ pipeline {
349349
-v $WORKSPACE/src/github.com/percona/percona-postgresql-operator:/go/src/github.com/percona/percona-postgresql-operator \
350350
-w /go/src/github.com/percona/percona-postgresql-operator \
351351
-e GO111MODULE=on \
352-
golang:1.22 sh -c '
352+
golang:1.23 sh -c '
353353
go install github.com/google/go-licenses@latest;
354354
/go/bin/go-licenses csv github.com/percona/percona-postgresql-operator/cmd/postgres-operator \
355355
| cut -d , -f 3 \

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

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
6+
controller-gen.kubebuilder.io/version: v0.16.3
77
name: pgupgrades.postgres-operator.crunchydata.com
88
spec:
99
group: postgres-operator.crunchydata.com
@@ -1242,7 +1242,8 @@ spec:
12421242
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
12431243
properties:
12441244
exec:
1245-
description: Exec specifies the action to take.
1245+
description: Exec specifies a command to execute in
1246+
the container.
12461247
properties:
12471248
command:
12481249
description: |-
@@ -1257,7 +1258,8 @@ spec:
12571258
x-kubernetes-list-type: atomic
12581259
type: object
12591260
httpGet:
1260-
description: HTTPGet specifies the http request to perform.
1261+
description: HTTPGet specifies an HTTP GET request to
1262+
perform.
12611263
properties:
12621264
host:
12631265
description: |-
@@ -1306,8 +1308,8 @@ spec:
13061308
- port
13071309
type: object
13081310
sleep:
1309-
description: Sleep represents the duration that the
1310-
container should sleep before being terminated.
1311+
description: Sleep represents a duration that the container
1312+
should sleep.
13111313
properties:
13121314
seconds:
13131315
description: Seconds is the number of seconds to
@@ -1320,8 +1322,8 @@ spec:
13201322
tcpSocket:
13211323
description: |-
13221324
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
1323-
for the backward compatibility. There are no validation of this field and
1324-
lifecycle hooks will fail in runtime when tcp handler is specified.
1325+
for backward compatibility. There is no validation of this field and
1326+
lifecycle hooks will fail at runtime when it is specified.
13251327
properties:
13261328
host:
13271329
description: 'Optional: Host name to connect to,
@@ -1353,7 +1355,8 @@ spec:
13531355
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
13541356
properties:
13551357
exec:
1356-
description: Exec specifies the action to take.
1358+
description: Exec specifies a command to execute in
1359+
the container.
13571360
properties:
13581361
command:
13591362
description: |-
@@ -1368,7 +1371,8 @@ spec:
13681371
x-kubernetes-list-type: atomic
13691372
type: object
13701373
httpGet:
1371-
description: HTTPGet specifies the http request to perform.
1374+
description: HTTPGet specifies an HTTP GET request to
1375+
perform.
13721376
properties:
13731377
host:
13741378
description: |-
@@ -1417,8 +1421,8 @@ spec:
14171421
- port
14181422
type: object
14191423
sleep:
1420-
description: Sleep represents the duration that the
1421-
container should sleep before being terminated.
1424+
description: Sleep represents a duration that the container
1425+
should sleep.
14221426
properties:
14231427
seconds:
14241428
description: Seconds is the number of seconds to
@@ -1431,8 +1435,8 @@ spec:
14311435
tcpSocket:
14321436
description: |-
14331437
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
1434-
for the backward compatibility. There are no validation of this field and
1435-
lifecycle hooks will fail in runtime when tcp handler is specified.
1438+
for backward compatibility. There is no validation of this field and
1439+
lifecycle hooks will fail at runtime when it is specified.
14361440
properties:
14371441
host:
14381442
description: 'Optional: Host name to connect to,
@@ -1460,7 +1464,8 @@ spec:
14601464
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
14611465
properties:
14621466
exec:
1463-
description: Exec specifies the action to take.
1467+
description: Exec specifies a command to execute in the
1468+
container.
14641469
properties:
14651470
command:
14661471
description: |-
@@ -1481,7 +1486,7 @@ spec:
14811486
format: int32
14821487
type: integer
14831488
grpc:
1484-
description: GRPC specifies an action involving a GRPC port.
1489+
description: GRPC specifies a GRPC HealthCheckRequest.
14851490
properties:
14861491
port:
14871492
description: Port number of the gRPC service. Number
@@ -1500,7 +1505,7 @@ spec:
15001505
- port
15011506
type: object
15021507
httpGet:
1503-
description: HTTPGet specifies the http request to perform.
1508+
description: HTTPGet specifies an HTTP GET request to perform.
15041509
properties:
15051510
host:
15061511
description: |-
@@ -1567,8 +1572,7 @@ spec:
15671572
format: int32
15681573
type: integer
15691574
tcpSocket:
1570-
description: TCPSocket specifies an action involving a TCP
1571-
port.
1575+
description: TCPSocket specifies a connection to a TCP port.
15721576
properties:
15731577
host:
15741578
description: 'Optional: Host name to connect to, defaults
@@ -1672,7 +1676,8 @@ spec:
16721676
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
16731677
properties:
16741678
exec:
1675-
description: Exec specifies the action to take.
1679+
description: Exec specifies a command to execute in the
1680+
container.
16761681
properties:
16771682
command:
16781683
description: |-
@@ -1693,7 +1698,7 @@ spec:
16931698
format: int32
16941699
type: integer
16951700
grpc:
1696-
description: GRPC specifies an action involving a GRPC port.
1701+
description: GRPC specifies a GRPC HealthCheckRequest.
16971702
properties:
16981703
port:
16991704
description: Port number of the gRPC service. Number
@@ -1712,7 +1717,7 @@ spec:
17121717
- port
17131718
type: object
17141719
httpGet:
1715-
description: HTTPGet specifies the http request to perform.
1720+
description: HTTPGet specifies an HTTP GET request to perform.
17161721
properties:
17171722
host:
17181723
description: |-
@@ -1779,8 +1784,7 @@ spec:
17791784
format: int32
17801785
type: integer
17811786
tcpSocket:
1782-
description: TCPSocket specifies an action involving a TCP
1783-
port.
1787+
description: TCPSocket specifies a connection to a TCP port.
17841788
properties:
17851789
host:
17861790
description: 'Optional: Host name to connect to, defaults
@@ -2128,7 +2132,8 @@ spec:
21282132
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
21292133
properties:
21302134
exec:
2131-
description: Exec specifies the action to take.
2135+
description: Exec specifies a command to execute in the
2136+
container.
21322137
properties:
21332138
command:
21342139
description: |-
@@ -2149,7 +2154,7 @@ spec:
21492154
format: int32
21502155
type: integer
21512156
grpc:
2152-
description: GRPC specifies an action involving a GRPC port.
2157+
description: GRPC specifies a GRPC HealthCheckRequest.
21532158
properties:
21542159
port:
21552160
description: Port number of the gRPC service. Number
@@ -2168,7 +2173,7 @@ spec:
21682173
- port
21692174
type: object
21702175
httpGet:
2171-
description: HTTPGet specifies the http request to perform.
2176+
description: HTTPGet specifies an HTTP GET request to perform.
21722177
properties:
21732178
host:
21742179
description: |-
@@ -2235,8 +2240,7 @@ spec:
22352240
format: int32
22362241
type: integer
22372242
tcpSocket:
2238-
description: TCPSocket specifies an action involving a TCP
2239-
port.
2243+
description: TCPSocket specifies a connection to a TCP port.
22402244
properties:
22412245
host:
22422246
description: 'Optional: Host name to connect to, defaults

0 commit comments

Comments
 (0)