Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into K8SPG-619
Browse files Browse the repository at this point in the history
  • Loading branch information
@pooknull
pooknull committed Dec 18, 2024
2 parents aaa2c86 + cc4d16a commit 57b343e
Show file tree
Hide file tree
Showing 30 changed files with 2,746 additions and 1,267 deletions.
2 changes: 1 addition & 1 deletion .github/linters/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module linters

go 1.20
go 1.23.4
4 changes: 2 additions & 2 deletions .github/workflows/reviewdog.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: '^1.22'
go-version: '^1.23'
- uses: actions/checkout@v4
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
Expand All @@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '^1.22'
go-version: '^1.23'
- run: go install mvdan.cc/sh/v3/cmd/shfmt@latest
- run: $(go env GOPATH)/bin/shfmt -bn -ci -s -w .
- name: suggester / shfmt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: '^1.20'
go-version: '^1.23'
- uses: actions/checkout@v4
- name: Basic tests
run: make check
- name: envtest
run: ENVTEST_K8S_VERSION=1.26 make check-envtest
run: ENVTEST_K8S_VERSION=1.28 make check-envtest
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ pipeline {
-v $WORKSPACE/src/github.com/percona/percona-postgresql-operator:/go/src/github.com/percona/percona-postgresql-operator \
-w /go/src/github.com/percona/percona-postgresql-operator \
-e GO111MODULE=on \
golang:1.22 sh -c '
golang:1.23 sh -c '
go install github.com/google/go-licenses@latest;
/go/bin/go-licenses csv github.com/percona/percona-postgresql-operator/cmd/postgres-operator \
| cut -d , -f 3 \
Expand Down
58 changes: 31 additions & 27 deletions build/crd/crunchy/generated/postgres-operator.crunchydata.com_pgupgrades.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1242,7 +1242,8 @@ spec:
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
description: Exec specifies the action to take.
description: Exec specifies a command to execute in
the container.
properties:
command:
description: |-
Expand All @@ -1257,7 +1258,8 @@ spec:
x-kubernetes-list-type: atomic
type: object
httpGet:
description: HTTPGet specifies the http request to perform.
description: HTTPGet specifies an HTTP GET request to
perform.
properties:
host:
description: |-
Expand Down Expand Up @@ -1306,8 +1308,8 @@ spec:
- port
type: object
sleep:
description: Sleep represents the duration that the
container should sleep before being terminated.
description: Sleep represents a duration that the container
should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
Expand All @@ -1320,8 +1322,8 @@ spec:
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
for the backward compatibility. There are no validation of this field and
lifecycle hooks will fail in runtime when tcp handler is specified.
for backward compatibility. There is no validation of this field and
lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
Expand Down Expand Up @@ -1353,7 +1355,8 @@ spec:
More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
properties:
exec:
description: Exec specifies the action to take.
description: Exec specifies a command to execute in
the container.
properties:
command:
description: |-
Expand All @@ -1368,7 +1371,8 @@ spec:
x-kubernetes-list-type: atomic
type: object
httpGet:
description: HTTPGet specifies the http request to perform.
description: HTTPGet specifies an HTTP GET request to
perform.
properties:
host:
description: |-
Expand Down Expand Up @@ -1417,8 +1421,8 @@ spec:
- port
type: object
sleep:
description: Sleep represents the duration that the
container should sleep before being terminated.
description: Sleep represents a duration that the container
should sleep.
properties:
seconds:
description: Seconds is the number of seconds to
Expand All @@ -1431,8 +1435,8 @@ spec:
tcpSocket:
description: |-
Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
for the backward compatibility. There are no validation of this field and
lifecycle hooks will fail in runtime when tcp handler is specified.
for backward compatibility. There is no validation of this field and
lifecycle hooks will fail at runtime when it is specified.
properties:
host:
description: 'Optional: Host name to connect to,
Expand Down Expand Up @@ -1460,7 +1464,8 @@ spec:
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
description: Exec specifies the action to take.
description: Exec specifies a command to execute in the
container.
properties:
command:
description: |-
Expand All @@ -1481,7 +1486,7 @@ spec:
format: int32
type: integer
grpc:
description: GRPC specifies an action involving a GRPC port.
description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
Expand All @@ -1500,7 +1505,7 @@ spec:
- port
type: object
httpGet:
description: HTTPGet specifies the http request to perform.
description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Expand Down Expand Up @@ -1567,8 +1572,7 @@ spec:
format: int32
type: integer
tcpSocket:
description: TCPSocket specifies an action involving a TCP
port.
description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
Expand Down Expand Up @@ -1672,7 +1676,8 @@ spec:
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
description: Exec specifies the action to take.
description: Exec specifies a command to execute in the
container.
properties:
command:
description: |-
Expand All @@ -1693,7 +1698,7 @@ spec:
format: int32
type: integer
grpc:
description: GRPC specifies an action involving a GRPC port.
description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
Expand All @@ -1712,7 +1717,7 @@ spec:
- port
type: object
httpGet:
description: HTTPGet specifies the http request to perform.
description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Expand Down Expand Up @@ -1779,8 +1784,7 @@ spec:
format: int32
type: integer
tcpSocket:
description: TCPSocket specifies an action involving a TCP
port.
description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
Expand Down Expand Up @@ -2128,7 +2132,8 @@ spec:
More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
properties:
exec:
description: Exec specifies the action to take.
description: Exec specifies a command to execute in the
container.
properties:
command:
description: |-
Expand All @@ -2149,7 +2154,7 @@ spec:
format: int32
type: integer
grpc:
description: GRPC specifies an action involving a GRPC port.
description: GRPC specifies a GRPC HealthCheckRequest.
properties:
port:
description: Port number of the gRPC service. Number
Expand All @@ -2168,7 +2173,7 @@ spec:
- port
type: object
httpGet:
description: HTTPGet specifies the http request to perform.
description: HTTPGet specifies an HTTP GET request to perform.
properties:
host:
description: |-
Expand Down Expand Up @@ -2235,8 +2240,7 @@ spec:
format: int32
type: integer
tcpSocket:
description: TCPSocket specifies an action involving a TCP
port.
description: TCPSocket specifies a connection to a TCP port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
Expand Down
Loading

0 comments on commit 57b343e

Please sign in to comment.