Skip to content

Commit b560427

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #380 from justinsb/bump_controller_runtime
Bump controller-runtime to 0.17 / kube to 1.29
2 parents f3dc506 + 7a185d0 commit b560427

File tree

11 files changed

+398
-342
lines changed

11 files changed

+398
-342
lines changed

‎.github/workflows/main.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up go
1616
uses: actions/setup-go@v2
1717
with:
18-
go-version: '1.20'
18+
go-version: '1.22'
1919
stable: true
2020

2121
- run: |
@@ -39,7 +39,7 @@ jobs:
3939
- name: Set up go
4040
uses: actions/setup-go@v2
4141
with:
42-
go-version: '1.20'
42+
go-version: '1.22'
4343
stable: true
4444

4545
- run: |
@@ -64,7 +64,7 @@ jobs:
6464
- uses: actions/checkout@v1
6565
- uses: actions/setup-go@v1
6666
with:
67-
go-version: '1.20'
67+
go-version: '1.22'
6868
- name: Install latest version of Kind
6969
run: |
7070
GO111MODULE=on go get sigs.k8s.io/kind

‎applylib/go.mod

+22-20
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
module sigs.k8s.io/kubebuilder-declarative-pattern/applylib
22

3-
go 1.19
3+
go 1.21
4+
5+
toolchain go1.22.0
46

57
// Sometimes handy for development, but breaks usage as a library
68
// Instead, please break apart commits to this module
79
// replace sigs.k8s.io/kubebuilder-declarative-pattern/mockkubeapiserver => ../mockkubeapiserver
810

911
require (
10-
github.com/google/go-cmp v0.5.9
11-
k8s.io/api v0.28.1
12-
k8s.io/apimachinery v0.28.1
13-
k8s.io/client-go v0.28.1
14-
k8s.io/klog/v2 v2.100.1
15-
sigs.k8s.io/controller-runtime v0.16.1
12+
github.com/google/go-cmp v0.6.0
13+
k8s.io/api v0.29.1
14+
k8s.io/apimachinery v0.29.1
15+
k8s.io/client-go v0.29.1
16+
k8s.io/klog/v2 v2.110.1
17+
sigs.k8s.io/controller-runtime v0.17.2
1618
sigs.k8s.io/kubebuilder-declarative-pattern/mockkubeapiserver v0.0.0-20221021151406-9bd3fb842119
1719
sigs.k8s.io/kustomize/kstatus v0.0.2-0.20200509233124-065f70705d4d
18-
sigs.k8s.io/yaml v1.3.0
20+
sigs.k8s.io/yaml v1.4.0
1921
)
2022

2123
require (
2224
github.com/davecgh/go-spew v1.1.1 // indirect
23-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
24-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
25-
github.com/go-logr/logr v1.2.4 // indirect
25+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
27+
github.com/go-logr/logr v1.4.1 // indirect
2628
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2729
github.com/go-openapi/jsonreference v0.20.2 // indirect
2830
github.com/go-openapi/swag v0.22.3 // indirect
@@ -43,19 +45,19 @@ require (
4345
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
4446
github.com/pkg/errors v0.9.1 // indirect
4547
github.com/spf13/pflag v1.0.5 // indirect
46-
golang.org/x/net v0.13.0 // indirect
47-
golang.org/x/oauth2 v0.8.0 // indirect
48-
golang.org/x/sys v0.11.0 // indirect
49-
golang.org/x/term v0.10.0 // indirect
50-
golang.org/x/text v0.11.0 // indirect
48+
golang.org/x/net v0.19.0 // indirect
49+
golang.org/x/oauth2 v0.12.0 // indirect
50+
golang.org/x/sys v0.16.0 // indirect
51+
golang.org/x/term v0.15.0 // indirect
52+
golang.org/x/text v0.14.0 // indirect
5153
golang.org/x/time v0.3.0 // indirect
5254
google.golang.org/appengine v1.6.7 // indirect
53-
google.golang.org/protobuf v1.30.0 // indirect
55+
google.golang.org/protobuf v1.31.0 // indirect
5456
gopkg.in/inf.v0 v0.9.1 // indirect
5557
gopkg.in/yaml.v2 v2.4.0 // indirect
5658
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
58-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
59+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
60+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
5961
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
60-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
62+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
6163
)

‎applylib/go.sum

+61-56
Large diffs are not rendered by default.

‎commonclient/restmapper_cr11.go

+9-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import (
1010
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
1111
)
1212

13-
// NewDiscoveryRESTMapper is a version-independent wrapper around apiutil.NewDiscoveryRESTMapper
13+
// NewDiscoveryRESTMapper is a version-independent wrapper around creating a meta.RESTMapper
14+
// It calls NewDynamicRESTMapper as of kubebuilder-declarative-pattern 0.17.
15+
// Deprecated: prefer NewDynamicRESTMapper
1416
func NewDiscoveryRESTMapper(c *rest.Config, httpClient *http.Client) (meta.RESTMapper, error) {
15-
return apiutil.NewDiscoveryRESTMapper(c)
17+
return NewDynamicRESTMapper(c)
18+
}
19+
20+
// NewDynamicRESTMapper is a version-independent wrapper around apiutil.NewDynamicRESTMapper
21+
func NewDynamicRESTMapper(c *rest.Config, httpClient *http.Client) (meta.RESTMapper, error) {
22+
return apiutil.NewDynamicRESTMapper(c)
1623
}

‎commonclient/restmapper_cr15.go

+9-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ import (
1010
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
1111
)
1212

13-
// NewDiscoveryRESTMapper is a version-independent wrapper around apiutil.NewDiscoveryRESTMapper
13+
// NewDiscoveryRESTMapper is a version-independent wrapper around creating a meta.RESTMapper
14+
// It calls NewDynamicRESTMapper as of kubebuilder-declarative-pattern 0.17.
15+
// Deprecated: prefer NewDynamicRESTMapper
1416
func NewDiscoveryRESTMapper(c *rest.Config, httpClient *http.Client) (meta.RESTMapper, error) {
15-
return apiutil.NewDiscoveryRESTMapper(c, httpClient)
17+
return NewDynamicRESTMapper(c, httpClient)
18+
}
19+
20+
// NewDynamicRESTMapper is a version-independent wrapper around apiutil.NewDynamicRESTMapper
21+
func NewDynamicRESTMapper(c *rest.Config, httpClient *http.Client) (meta.RESTMapper, error) {
22+
return apiutil.NewDynamicRESTMapper(c, httpClient)
1623
}

‎examples/guestbook-operator/go.mod

+38-34
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
module sigs.k8s.io/kubebuilder-declarative-pattern/examples/guestbook-operator
22

3-
go 1.18
3+
go 1.21
4+
5+
toolchain go1.22.0
46

57
require (
6-
github.com/go-logr/logr v1.2.4
7-
k8s.io/apimachinery v0.28.1
8-
k8s.io/client-go v0.28.1
9-
sigs.k8s.io/controller-runtime v0.16.1
8+
github.com/go-logr/logr v1.4.1
9+
k8s.io/apimachinery v0.29.1
10+
k8s.io/client-go v0.29.1
11+
sigs.k8s.io/controller-runtime v0.17.2
1012
sigs.k8s.io/kubebuilder-declarative-pattern v0.0.0-20210922163802-cac4a6cf1977
1113
)
1214

@@ -18,19 +20,19 @@ require (
1820
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1921
github.com/chai2010/gettext-go v1.0.2 // indirect
2022
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
23+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2224
github.com/emirpasic/gods v1.12.0 // indirect
2325
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
24-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
26+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
2527
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
2628
github.com/fatih/camelcase v1.0.0 // indirect
27-
github.com/fsnotify/fsnotify v1.6.0 // indirect
29+
github.com/fsnotify/fsnotify v1.7.0 // indirect
2830
github.com/fvbommel/sortorder v1.1.0 // indirect
2931
github.com/go-errors/errors v1.4.2 // indirect
3032
github.com/go-git/gcfg v1.5.0 // indirect
3133
github.com/go-git/go-billy/v5 v5.0.0 // indirect
3234
github.com/go-git/go-git/v5 v5.1.0 // indirect
33-
github.com/go-logr/zapr v1.2.4 // indirect
35+
github.com/go-logr/zapr v1.3.0 // indirect
3436
github.com/go-openapi/jsonpointer v0.19.6 // indirect
3537
github.com/go-openapi/jsonreference v0.20.2 // indirect
3638
github.com/go-openapi/swag v0.22.3 // indirect
@@ -39,10 +41,11 @@ require (
3941
github.com/golang/protobuf v1.5.3 // indirect
4042
github.com/google/btree v1.0.1 // indirect
4143
github.com/google/gnostic-models v0.6.8 // indirect
42-
github.com/google/go-cmp v0.5.9 // indirect
44+
github.com/google/go-cmp v0.6.0 // indirect
4345
github.com/google/gofuzz v1.2.0 // indirect
4446
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4547
github.com/google/uuid v1.3.0 // indirect
48+
github.com/gorilla/websocket v1.5.0 // indirect
4649
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
4750
github.com/imdario/mergo v0.3.15 // indirect
4851
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -53,7 +56,7 @@ require (
5356
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
5457
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
5558
github.com/mailru/easyjson v0.7.7 // indirect
56-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
59+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
5760
github.com/mitchellh/go-homedir v1.1.0 // indirect
5861
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
5962
github.com/moby/spdystream v0.2.0 // indirect
@@ -62,12 +65,13 @@ require (
6265
github.com/modern-go/reflect2 v1.0.2 // indirect
6366
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
6467
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
68+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6569
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
6670
github.com/pkg/errors v0.9.1 // indirect
67-
github.com/prometheus/client_golang v1.16.0 // indirect
68-
github.com/prometheus/client_model v0.4.0 // indirect
69-
github.com/prometheus/common v0.44.0 // indirect
70-
github.com/prometheus/procfs v0.10.1 // indirect
71+
github.com/prometheus/client_golang v1.18.0 // indirect
72+
github.com/prometheus/client_model v0.5.0 // indirect
73+
github.com/prometheus/common v0.45.0 // indirect
74+
github.com/prometheus/procfs v0.12.0 // indirect
7175
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7276
github.com/sergi/go-diff v1.1.0 // indirect
7377
github.com/spf13/cobra v1.7.0 // indirect
@@ -76,40 +80,40 @@ require (
7680
github.com/xlab/treeprint v1.2.0 // indirect
7781
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
7882
go.uber.org/multierr v1.11.0 // indirect
79-
go.uber.org/zap v1.25.0 // indirect
80-
golang.org/x/crypto v0.11.0 // indirect
83+
go.uber.org/zap v1.26.0 // indirect
84+
golang.org/x/crypto v0.16.0 // indirect
8185
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
82-
golang.org/x/net v0.13.0 // indirect
83-
golang.org/x/oauth2 v0.8.0 // indirect
84-
golang.org/x/sync v0.2.0 // indirect
85-
golang.org/x/sys v0.11.0 // indirect
86-
golang.org/x/term v0.10.0 // indirect
87-
golang.org/x/text v0.11.0 // indirect
86+
golang.org/x/net v0.19.0 // indirect
87+
golang.org/x/oauth2 v0.12.0 // indirect
88+
golang.org/x/sync v0.5.0 // indirect
89+
golang.org/x/sys v0.16.0 // indirect
90+
golang.org/x/term v0.15.0 // indirect
91+
golang.org/x/text v0.14.0 // indirect
8892
golang.org/x/time v0.3.0 // indirect
8993
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9094
google.golang.org/appengine v1.6.7 // indirect
91-
google.golang.org/protobuf v1.30.0 // indirect
95+
google.golang.org/protobuf v1.31.0 // indirect
9296
gopkg.in/inf.v0 v0.9.1 // indirect
9397
gopkg.in/warnings.v0 v0.1.2 // indirect
9498
gopkg.in/yaml.v2 v2.4.0 // indirect
9599
gopkg.in/yaml.v3 v3.0.1 // indirect
96-
k8s.io/api v0.28.1 // indirect
97-
k8s.io/apiextensions-apiserver v0.28.0 // indirect
98-
k8s.io/cli-runtime v0.28.1 // indirect
99-
k8s.io/component-base v0.28.1 // indirect
100-
k8s.io/klog/v2 v2.100.1 // indirect
101-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
102-
k8s.io/kubectl v0.28.1 // indirect
103-
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
100+
k8s.io/api v0.29.1 // indirect
101+
k8s.io/apiextensions-apiserver v0.29.0 // indirect
102+
k8s.io/cli-runtime v0.29.1 // indirect
103+
k8s.io/component-base v0.29.1 // indirect
104+
k8s.io/klog/v2 v2.110.1 // indirect
105+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
106+
k8s.io/kubectl v0.29.1 // indirect
107+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
104108
sigs.k8s.io/cli-utils v0.33.0 // indirect
105109
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
106110
sigs.k8s.io/kubebuilder-declarative-pattern/applylib v0.0.0-20230420203711-4abaa68e1923 // indirect
107111
sigs.k8s.io/kubebuilder-declarative-pattern/mockkubeapiserver v0.0.0-20230303024857-d1f76c15e05b // indirect
108112
sigs.k8s.io/kustomize/api v0.14.0 // indirect
109113
sigs.k8s.io/kustomize/kstatus v0.0.2-0.20200509233124-065f70705d4d // indirect
110114
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
111-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
112-
sigs.k8s.io/yaml v1.3.0 // indirect
115+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
116+
sigs.k8s.io/yaml v1.4.0 // indirect
113117
)
114118

115119
replace sigs.k8s.io/kubebuilder-declarative-pattern v0.0.0-20210922163802-cac4a6cf1977 => ../../

0 commit comments

Comments
 (0)