Skip to content

Commit ce5e62e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #291 from camilamacedo86/k8s-bump
✨ bump k8s from 1.25 to 1.26
2 parents 2869741 + ef14bb3 commit ce5e62e

File tree

8 files changed

+301
-831
lines changed

8 files changed

+301
-831
lines changed

‎applylib/go.mod

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,23 @@ go 1.19
77
// replace sigs.k8s.io/kubebuilder-declarative-pattern/mockkubeapiserver => ../mockkubeapiserver
88

99
require (
10-
github.com/google/go-cmp v0.5.8
11-
k8s.io/api v0.25.0
12-
k8s.io/apimachinery v0.25.0
13-
k8s.io/client-go v0.25.0
14-
k8s.io/klog/v2 v2.70.1
15-
sigs.k8s.io/controller-runtime v0.13.0
10+
github.com/google/go-cmp v0.5.9
11+
k8s.io/api v0.26.0
12+
k8s.io/apimachinery v0.26.0
13+
k8s.io/client-go v0.26.0
14+
k8s.io/klog/v2 v2.80.1
15+
sigs.k8s.io/controller-runtime v0.14.1
1616
sigs.k8s.io/kubebuilder-declarative-pattern/mockkubeapiserver v0.0.0-20221021151406-9bd3fb842119
1717
sigs.k8s.io/yaml v1.3.0
1818
)
1919

2020
require (
21-
github.com/PuerkitoBio/purell v1.1.1 // indirect
22-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2321
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
22+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2523
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2624
github.com/go-logr/logr v1.2.3 // indirect
2725
github.com/go-openapi/jsonpointer v0.19.5 // indirect
28-
github.com/go-openapi/jsonreference v0.19.5 // indirect
26+
github.com/go-openapi/jsonreference v0.20.0 // indirect
2927
github.com/go-openapi/swag v0.19.14 // indirect
3028
github.com/gogo/protobuf v1.3.2 // indirect
3129
github.com/golang/protobuf v1.5.2 // indirect
@@ -44,19 +42,19 @@ require (
4442
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
4543
github.com/pkg/errors v0.9.1 // indirect
4644
github.com/spf13/pflag v1.0.5 // indirect
47-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
48-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
49-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
50-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
51-
golang.org/x/text v0.3.7 // indirect
52-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
45+
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
46+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
47+
golang.org/x/sys v0.3.0 // indirect
48+
golang.org/x/term v0.3.0 // indirect
49+
golang.org/x/text v0.5.0 // indirect
50+
golang.org/x/time v0.3.0 // indirect
5351
google.golang.org/appengine v1.6.7 // indirect
54-
google.golang.org/protobuf v1.28.0 // indirect
52+
google.golang.org/protobuf v1.28.1 // indirect
5553
gopkg.in/inf.v0 v0.9.1 // indirect
5654
gopkg.in/yaml.v2 v2.4.0 // indirect
5755
gopkg.in/yaml.v3 v3.0.1 // indirect
58-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
59-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
56+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
57+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
6058
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
6159
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
6260
)

‎applylib/go.sum

Lines changed: 49 additions & 54 deletions
Large diffs are not rendered by default.

‎examples/guestbook-operator/go.mod

Lines changed: 32 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,112 +4,102 @@ go 1.18
44

55
require (
66
github.com/go-logr/logr v1.2.3
7-
k8s.io/apimachinery v0.25.4
8-
k8s.io/client-go v0.25.0
9-
sigs.k8s.io/controller-runtime v0.13.0
7+
k8s.io/apimachinery v0.26.0
8+
k8s.io/client-go v0.26.0
9+
sigs.k8s.io/controller-runtime v0.14.1
1010
sigs.k8s.io/kubebuilder-declarative-pattern v0.0.0-20210922163802-cac4a6cf1977
1111
)
1212

1313
require (
14-
cloud.google.com/go v0.99.0 // indirect
1514
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
16-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
17-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
18-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
19-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
20-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
21-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2215
github.com/MakeNowJust/heredoc v1.0.0 // indirect
23-
github.com/PuerkitoBio/purell v1.1.1 // indirect
24-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2516
github.com/beorn7/perks v1.0.1 // indirect
2617
github.com/blang/semver/v4 v4.0.0 // indirect
2718
github.com/cespare/xxhash/v2 v2.1.2 // indirect
2819
github.com/chai2010/gettext-go v1.0.2 // indirect
2920
github.com/davecgh/go-spew v1.1.1 // indirect
30-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
21+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3122
github.com/emirpasic/gods v1.12.0 // indirect
3223
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
3324
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
3425
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
3526
github.com/fatih/camelcase v1.0.0 // indirect
36-
github.com/fsnotify/fsnotify v1.5.4 // indirect
27+
github.com/fsnotify/fsnotify v1.6.0 // indirect
3728
github.com/fvbommel/sortorder v1.0.1 // indirect
3829
github.com/go-errors/errors v1.0.1 // indirect
3930
github.com/go-git/gcfg v1.5.0 // indirect
4031
github.com/go-git/go-billy/v5 v5.0.0 // indirect
4132
github.com/go-git/go-git/v5 v5.1.0 // indirect
4233
github.com/go-logr/zapr v1.2.3 // indirect
4334
github.com/go-openapi/jsonpointer v0.19.5 // indirect
44-
github.com/go-openapi/jsonreference v0.19.5 // indirect
35+
github.com/go-openapi/jsonreference v0.20.0 // indirect
4536
github.com/go-openapi/swag v0.19.14 // indirect
4637
github.com/gogo/protobuf v1.3.2 // indirect
47-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
4838
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4939
github.com/golang/protobuf v1.5.2 // indirect
5040
github.com/google/btree v1.0.1 // indirect
5141
github.com/google/gnostic v0.5.7-v3refs // indirect
52-
github.com/google/go-cmp v0.5.8 // indirect
42+
github.com/google/go-cmp v0.5.9 // indirect
5343
github.com/google/gofuzz v1.2.0 // indirect
5444
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5545
github.com/google/uuid v1.3.0 // indirect
5646
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
5747
github.com/imdario/mergo v0.3.12 // indirect
58-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
48+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5949
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
6050
github.com/jonboulle/clockwork v0.2.2 // indirect
6151
github.com/josharian/intern v1.0.0 // indirect
6252
github.com/json-iterator/go v1.1.12 // indirect
6353
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
6454
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6555
github.com/mailru/easyjson v0.7.6 // indirect
66-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
56+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
6757
github.com/mitchellh/go-homedir v1.1.0 // indirect
6858
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
6959
github.com/moby/spdystream v0.2.0 // indirect
70-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
60+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
7161
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7262
github.com/modern-go/reflect2 v1.0.2 // indirect
7363
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7464
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7565
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7666
github.com/pkg/errors v0.9.1 // indirect
77-
github.com/prometheus/client_golang v1.12.2 // indirect
78-
github.com/prometheus/client_model v0.2.0 // indirect
79-
github.com/prometheus/common v0.32.1 // indirect
80-
github.com/prometheus/procfs v0.7.3 // indirect
81-
github.com/russross/blackfriday v1.5.2 // indirect
67+
github.com/prometheus/client_golang v1.14.0 // indirect
68+
github.com/prometheus/client_model v0.3.0 // indirect
69+
github.com/prometheus/common v0.37.0 // indirect
70+
github.com/prometheus/procfs v0.8.0 // indirect
71+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8272
github.com/sergi/go-diff v1.1.0 // indirect
83-
github.com/spf13/cobra v1.4.0 // indirect
73+
github.com/spf13/cobra v1.6.0 // indirect
8474
github.com/spf13/pflag v1.0.5 // indirect
8575
github.com/xanzy/ssh-agent v0.2.1 // indirect
8676
github.com/xlab/treeprint v1.1.0 // indirect
8777
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
8878
go.uber.org/atomic v1.7.0 // indirect
8979
go.uber.org/multierr v1.6.0 // indirect
90-
go.uber.org/zap v1.21.0 // indirect
91-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
92-
golang.org/x/net v0.2.0 // indirect
93-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
94-
golang.org/x/sys v0.2.0 // indirect
95-
golang.org/x/term v0.2.0 // indirect
96-
golang.org/x/text v0.4.0 // indirect
97-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
80+
go.uber.org/zap v1.24.0 // indirect
81+
golang.org/x/crypto v0.1.0 // indirect
82+
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
83+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
84+
golang.org/x/sys v0.3.0 // indirect
85+
golang.org/x/term v0.3.0 // indirect
86+
golang.org/x/text v0.5.0 // indirect
87+
golang.org/x/time v0.3.0 // indirect
9888
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
9989
google.golang.org/appengine v1.6.7 // indirect
100-
google.golang.org/protobuf v1.28.0 // indirect
90+
google.golang.org/protobuf v1.28.1 // indirect
10191
gopkg.in/inf.v0 v0.9.1 // indirect
10292
gopkg.in/warnings.v0 v0.1.2 // indirect
10393
gopkg.in/yaml.v2 v2.4.0 // indirect
10494
gopkg.in/yaml.v3 v3.0.1 // indirect
105-
k8s.io/api v0.25.0 // indirect
106-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
107-
k8s.io/cli-runtime v0.25.0 // indirect
108-
k8s.io/component-base v0.25.0 // indirect
95+
k8s.io/api v0.26.0 // indirect
96+
k8s.io/apiextensions-apiserver v0.26.0 // indirect
97+
k8s.io/cli-runtime v0.26.0 // indirect
98+
k8s.io/component-base v0.26.0 // indirect
10999
k8s.io/klog/v2 v2.80.1 // indirect
110-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
111-
k8s.io/kubectl v0.25.0 // indirect
112-
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
100+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
101+
k8s.io/kubectl v0.26.0 // indirect
102+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
113103
sigs.k8s.io/cli-utils v0.33.0 // indirect
114104
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
115105
sigs.k8s.io/kubebuilder-declarative-pattern/applylib v0.0.0-20221111030210-e034bc5469a5 // indirect

0 commit comments

Comments
 (0)