Skip to content

Commit 93a253b

Browse files
authored
Bump k8s api to v0.23.5 for operator v1.9.0 (zalando#1854)
* Bump k8s api to v0.23.5 for operator v1.8.0 * Update k8s version in Makefile
1 parent 024aab1 commit 93a253b

File tree

11 files changed

+240
-77
lines changed

11 files changed

+240
-77
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ mocks:
8585
GO111MODULE=on go generate ./...
8686

8787
tools:
88-
GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.22.4
88+
GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.23.5
8989
GO111MODULE=on go install github.com/golang/mock/[email protected]
9090
GO111MODULE=on go mod tidy
9191

go.mod

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ require (
1313
github.com/stretchr/testify v1.7.0
1414
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e
1515
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.22.4
17-
k8s.io/apiextensions-apiserver v0.22.4
18-
k8s.io/apimachinery v0.22.4
19-
k8s.io/client-go v0.22.4
20-
k8s.io/code-generator v0.22.4
16+
k8s.io/api v0.23.5
17+
k8s.io/apiextensions-apiserver v0.23.5
18+
k8s.io/apimachinery v0.23.5
19+
k8s.io/client-go v0.23.5
20+
k8s.io/code-generator v0.23.5
2121
)
2222

2323
require (
2424
github.com/PuerkitoBio/purell v1.1.1 // indirect
2525
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2626
github.com/davecgh/go-spew v1.1.1 // indirect
2727
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
28-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
29-
github.com/go-logr/logr v0.4.0 // indirect
28+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
29+
github.com/go-logr/logr v1.2.0 // indirect
3030
github.com/go-openapi/jsonpointer v0.19.5 // indirect
3131
github.com/go-openapi/jsonreference v0.19.5 // indirect
3232
github.com/go-openapi/swag v0.19.14 // indirect
@@ -39,31 +39,32 @@ require (
3939
github.com/imdario/mergo v0.3.5 // indirect
4040
github.com/jmespath/go-jmespath v0.4.0 // indirect
4141
github.com/josharian/intern v1.0.0 // indirect
42-
github.com/json-iterator/go v1.1.11 // indirect
42+
github.com/json-iterator/go v1.1.12 // indirect
4343
github.com/kr/text v0.2.0 // indirect
4444
github.com/mailru/easyjson v0.7.6 // indirect
4545
github.com/moby/spdystream v0.2.0 // indirect
4646
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
47-
github.com/modern-go/reflect2 v1.0.1 // indirect
47+
github.com/modern-go/reflect2 v1.0.2 // indirect
4848
github.com/pmezard/go-difflib v1.0.0 // indirect
4949
github.com/spf13/pflag v1.0.5 // indirect
5050
golang.org/x/mod v0.5.1 // indirect
51-
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
52-
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
51+
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
52+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
5353
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect
54-
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
55-
golang.org/x/text v0.3.6 // indirect
54+
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
55+
golang.org/x/text v0.3.7 // indirect
5656
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
5757
golang.org/x/tools v0.1.7 // indirect
5858
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
5959
google.golang.org/appengine v1.6.7 // indirect
60-
google.golang.org/protobuf v1.26.0 // indirect
60+
google.golang.org/protobuf v1.27.1 // indirect
6161
gopkg.in/inf.v0 v0.9.1 // indirect
6262
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
63-
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
64-
k8s.io/klog/v2 v2.9.0 // indirect
65-
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
66-
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
67-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
63+
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
64+
k8s.io/klog/v2 v2.30.0 // indirect
65+
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
66+
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
67+
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
68+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
6869
sigs.k8s.io/yaml v1.2.0 // indirect
6970
)

go.sum

Lines changed: 148 additions & 41 deletions
Large diffs are not rendered by default.

pkg/cluster/connection_pooler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ func (c *Cluster) generateConnectionPoolerPodTemplate(role PostgresRole) (
325325
},
326326
Env: envVars,
327327
ReadinessProbe: &v1.Probe{
328-
Handler: v1.Handler{
328+
ProbeHandler: v1.ProbeHandler{
329329
TCPSocket: &v1.TCPSocketAction{
330330
Port: intstr.IntOrString{IntVal: pgPort},
331331
},

pkg/cluster/k8sres.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ func extractPgVersionFromBinPath(binPath string, template string) (string, error
11291129
func generateSpiloReadinessProbe() *v1.Probe {
11301130
return &v1.Probe{
11311131
FailureThreshold: 3,
1132-
Handler: v1.Handler{
1132+
ProbeHandler: v1.ProbeHandler{
11331133
HTTPGet: &v1.HTTPGetAction{
11341134
Path: "/readiness",
11351135
Port: intstr.IntOrString{IntVal: patroni.ApiPort},

pkg/generated/clientset/versioned/clientset.go

Lines changed: 28 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/acid.zalan.do_client.go

Lines changed: 19 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresql.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/clientset/versioned/typed/acid.zalan.do/v1/fake/fake_postgresteam.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/generated/clientset/versioned/typed/zalando.org/v1/fake/fake_fabriceventstream.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)