Skip to content

Commit f15cf61

Browse files
chore(deps): upgrade k8s version and client-go (#530)
Signed-off-by: fengshunli <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]>
1 parent 9a03edb commit f15cf61

File tree

2 files changed

+190
-703
lines changed

2 files changed

+190
-703
lines changed

go.mod

Lines changed: 81 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,66 @@
11
module github.com/argoproj/gitops-engine
22

3-
go 1.17
3+
go 1.19
44

55
require (
66
github.com/davecgh/go-spew v1.1.1
77
github.com/evanphx/json-patch v4.12.0+incompatible
8-
github.com/go-logr/logr v1.2.2
8+
github.com/go-logr/logr v1.2.3
99
github.com/golang/mock v1.6.0
1010
github.com/google/gnostic v0.5.7-v3refs
11-
github.com/spf13/cobra v1.5.0
12-
github.com/stretchr/testify v1.7.0
13-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
14-
google.golang.org/protobuf v1.27.1
15-
k8s.io/api v0.24.2
16-
k8s.io/apiextensions-apiserver v0.24.2
17-
k8s.io/apimachinery v0.24.2
18-
k8s.io/cli-runtime v0.24.2
19-
k8s.io/client-go v0.24.2
20-
k8s.io/klog/v2 v2.70.1
21-
k8s.io/kube-aggregator v0.24.2
22-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
23-
k8s.io/kubectl v0.24.2
24-
k8s.io/kubernetes v1.24.2
25-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1
11+
github.com/spf13/cobra v1.6.0
12+
github.com/stretchr/testify v1.8.1
13+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
14+
google.golang.org/protobuf v1.28.1
15+
k8s.io/api v0.26.4
16+
k8s.io/apiextensions-apiserver v0.26.4
17+
k8s.io/apimachinery v0.26.4
18+
k8s.io/cli-runtime v0.26.4
19+
k8s.io/client-go v0.26.4
20+
k8s.io/klog/v2 v2.100.1
21+
k8s.io/kube-aggregator v0.26.4
22+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
23+
k8s.io/kubectl v0.26.4
24+
k8s.io/kubernetes v1.26.4
25+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
2626
sigs.k8s.io/yaml v1.3.0
2727
)
2828

2929
require (
3030
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
31-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
32-
github.com/PuerkitoBio/purell v1.1.1 // indirect
33-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
34-
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
31+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
32+
github.com/beorn7/perks v1.0.1 // indirect
33+
github.com/blang/semver/v4 v4.0.0 // indirect
34+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
35+
github.com/chai2010/gettext-go v1.0.2 // indirect
3536
github.com/docker/distribution v2.8.1+incompatible // indirect
36-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
37+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3738
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
3839
github.com/fatih/camelcase v1.0.0 // indirect
3940
github.com/fvbommel/sortorder v1.0.1 // indirect
4041
github.com/go-errors/errors v1.0.1 // indirect
41-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
42-
github.com/go-openapi/jsonreference v0.19.5 // indirect
43-
github.com/go-openapi/swag v0.19.14 // indirect
42+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
43+
github.com/go-openapi/jsonreference v0.20.1 // indirect
44+
github.com/go-openapi/swag v0.22.3 // indirect
4445
github.com/gogo/protobuf v1.3.2 // indirect
4546
github.com/golang/protobuf v1.5.2 // indirect
4647
github.com/google/btree v1.0.1 // indirect
47-
github.com/google/go-cmp v0.5.5 // indirect
48+
github.com/google/go-cmp v0.5.9 // indirect
4849
github.com/google/gofuzz v1.1.0 // indirect
4950
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5051
github.com/google/uuid v1.1.2 // indirect
5152
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
52-
github.com/imdario/mergo v0.3.5 // indirect
53-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
53+
github.com/imdario/mergo v0.3.6 // indirect
54+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
5455
github.com/jonboulle/clockwork v0.2.2 // indirect
5556
github.com/josharian/intern v1.0.0 // indirect
5657
github.com/json-iterator/go v1.1.12 // indirect
5758
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
58-
github.com/mailru/easyjson v0.7.6 // indirect
59+
github.com/mailru/easyjson v0.7.7 // indirect
60+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
5961
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
6062
github.com/moby/spdystream v0.2.0 // indirect
61-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
63+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
6264
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6365
github.com/modern-go/reflect2 v1.0.2 // indirect
6466
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -67,55 +69,62 @@ require (
6769
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
6870
github.com/pkg/errors v0.9.1 // indirect
6971
github.com/pmezard/go-difflib v1.0.0 // indirect
70-
github.com/russross/blackfriday v1.5.2 // indirect
72+
github.com/prometheus/client_golang v1.14.0 // indirect
73+
github.com/prometheus/client_model v0.3.0 // indirect
74+
github.com/prometheus/common v0.37.0 // indirect
75+
github.com/prometheus/procfs v0.8.0 // indirect
76+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7177
github.com/spf13/pflag v1.0.5 // indirect
72-
github.com/stretchr/objx v0.2.0 // indirect
73-
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
78+
github.com/stretchr/objx v0.5.0 // indirect
79+
github.com/xlab/treeprint v1.1.0 // indirect
7480
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
75-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
76-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
77-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
78-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
79-
golang.org/x/text v0.3.7 // indirect
81+
golang.org/x/net v0.7.0 // indirect
82+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
83+
golang.org/x/sys v0.5.0 // indirect
84+
golang.org/x/term v0.5.0 // indirect
85+
golang.org/x/text v0.7.0 // indirect
8086
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
8187
google.golang.org/appengine v1.6.7 // indirect
8288
gopkg.in/inf.v0 v0.9.1 // indirect
8389
gopkg.in/yaml.v2 v2.4.0 // indirect
84-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
85-
k8s.io/apiserver v0.24.2 // indirect
86-
k8s.io/component-base v0.24.2 // indirect
87-
k8s.io/component-helpers v0.24.2 // indirect
88-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
89-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
90-
sigs.k8s.io/kustomize/api v0.11.4 // indirect
91-
sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
90+
gopkg.in/yaml.v3 v3.0.1 // indirect
91+
k8s.io/apiserver v0.26.4 // indirect
92+
k8s.io/component-base v0.26.4 // indirect
93+
k8s.io/component-helpers v0.26.4 // indirect
94+
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
95+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
96+
sigs.k8s.io/kustomize/api v0.12.1 // indirect
97+
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
9298
)
9399

94100
replace (
95-
// https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280
96-
k8s.io/api => k8s.io/api v0.24.2
97-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.2 // indirect
98-
k8s.io/apimachinery => k8s.io/apimachinery v0.24.2 // indirect
99-
k8s.io/apiserver => k8s.io/apiserver v0.24.2
100-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.2
101-
k8s.io/client-go => k8s.io/client-go v0.24.2
102-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.2
103-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.2
104-
k8s.io/code-generator => k8s.io/code-generator v0.24.2
105-
k8s.io/component-base => k8s.io/component-base v0.24.2
106-
k8s.io/component-helpers => k8s.io/component-helpers v0.24.2
107-
k8s.io/controller-manager => k8s.io/controller-manager v0.24.2
108-
k8s.io/cri-api => k8s.io/cri-api v0.24.2
109-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.2
110-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.2
111-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.2
112-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.2
113-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.2
114-
k8s.io/kubectl => k8s.io/kubectl v0.24.2
115-
k8s.io/kubelet => k8s.io/kubelet v0.24.2
116-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.2
117-
k8s.io/metrics => k8s.io/metrics v0.24.2
118-
k8s.io/mount-utils => k8s.io/mount-utils v0.24.2
119-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.2
120-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.2
101+
k8s.io/api => k8s.io/api v0.26.4
102+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.4
103+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.4
104+
k8s.io/apiserver => k8s.io/apiserver v0.26.4
105+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.4
106+
k8s.io/client-go => k8s.io/client-go v0.26.4
107+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.4
108+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.4
109+
k8s.io/code-generator => k8s.io/code-generator v0.26.4
110+
k8s.io/component-base => k8s.io/component-base v0.26.4
111+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.4
112+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.4
113+
k8s.io/cri-api => k8s.io/cri-api v0.26.4
114+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.4
115+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.4
116+
k8s.io/kms => k8s.io/kms v0.26.4
117+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.4
118+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.4
119+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.4
120+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.4
121+
k8s.io/kubectl => k8s.io/kubectl v0.26.4
122+
k8s.io/kubelet => k8s.io/kubelet v0.26.4
123+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.4
124+
k8s.io/metrics => k8s.io/metrics v0.26.4
125+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.4
126+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.4
127+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.4
128+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.4
129+
k8s.io/sample-controller => k8s.io/sample-controller v0.26.4
121130
)

0 commit comments

Comments
 (0)