Skip to content

Commit 42992e0

Browse files
authored
upgrade k8s dependency 1.18.x (openkruise#711)
Signed-off-by: liheng.zms <[email protected]>
1 parent 1d4d2bd commit 42992e0

File tree

2,288 files changed

+211477
-178939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,288 files changed

+211477
-178939
lines changed

.lift.toml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ignore results from vendor directories
2+
ignoreFiles = """
3+
vendor/
4+
"""

config/crd/bases/apps.kruise.io_advancedcronjobs.yaml

+24-2
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,30 @@ spec:
193193
active:
194194
description: A list of pointers to currently running jobs.
195195
items:
196-
description: ObjectReference contains enough information to let you
197-
inspect or modify the referred object.
196+
description: 'ObjectReference contains enough information to let you
197+
inspect or modify the referred object. --- New uses of this type
198+
are discouraged because of difficulty describing its usage when
199+
embedded in APIs. 1. Ignored fields. It includes many fields which
200+
are not generally honored. For instance, ResourceVersion and FieldPath
201+
are both very rarely valid in actual usage. 2. Invalid usage help. It
202+
is impossible to add specific help for individual usage. In most
203+
embedded usages, there are particular restrictions like, "must
204+
refer only to types A and B" or "UID not honored" or "name must
205+
be restricted". Those cannot be well described when embedded. 3.
206+
Inconsistent validation. Because the usages are different, the
207+
validation rules are different by usage, which makes it hard for
208+
users to predict what will happen. 4. The fields are both imprecise
209+
and overly precise. Kind is not a precise mapping to a URL. This
210+
can produce ambiguity during interpretation and require a REST
211+
mapping. In most cases, the dependency is on the group,resource
212+
tuple and the version of the actual struct is irrelevant. 5.
213+
We cannot easily change it. Because this type is embedded in many
214+
locations, updates to this type will affect numerous schemas. Don''t
215+
make new APIs embed an underspecified API type they do not control.
216+
Instead of using this type, create a locally provided and used type
217+
that is well-focused on your reference. For example, ServiceReferences
218+
for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
219+
.'
198220
type: object
199221
x-kubernetes-preserve-unknown-fields: true
200222
type: array

config/crd/bases/apps.kruise.io_nodeimages.yaml

+29-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,35 @@ spec:
9595
this image is managed by a controller, then an entry in
9696
this list will point to this controller.
9797
items:
98-
description: ObjectReference contains enough information
99-
to let you inspect or modify the referred object.
98+
description: 'ObjectReference contains enough information
99+
to let you inspect or modify the referred object. ---
100+
New uses of this type are discouraged because of difficulty
101+
describing its usage when embedded in APIs. 1. Ignored
102+
fields. It includes many fields which are not generally
103+
honored. For instance, ResourceVersion and FieldPath
104+
are both very rarely valid in actual usage. 2. Invalid
105+
usage help. It is impossible to add specific help for
106+
individual usage. In most embedded usages, there are
107+
particular restrictions like, "must refer only to
108+
types A and B" or "UID not honored" or "name must be
109+
restricted". Those cannot be well described when
110+
embedded. 3. Inconsistent validation. Because the
111+
usages are different, the validation rules are different
112+
by usage, which makes it hard for users to predict what
113+
will happen. 4. The fields are both imprecise and overly
114+
precise. Kind is not a precise mapping to a URL. This
115+
can produce ambiguity during interpretation and
116+
require a REST mapping. In most cases, the dependency
117+
is on the group,resource tuple and the version of
118+
the actual struct is irrelevant. 5. We cannot easily
119+
change it. Because this type is embedded in many locations,
120+
updates to this type will affect numerous schemas. Don''t
121+
make new APIs embed an underspecified API type they
122+
do not control. Instead of using this type, create a
123+
locally provided and used type that is well-focused
124+
on your reference. For example, ServiceReferences for
125+
admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
126+
.'
100127
type: object
101128
x-kubernetes-preserve-unknown-fields: true
102129
type: array

go.mod

+37-37
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/docker/docker v1.4.2-0.20180612054059-a9fbbdc8dd87
1616
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
1717
github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
18-
github.com/go-openapi/spec v0.19.2
18+
github.com/go-openapi/spec v0.19.3
1919
github.com/gogo/googleapis v1.4.0 // indirect
2020
github.com/gorilla/mux v1.7.3
2121
github.com/onsi/ginkgo v1.12.1
@@ -28,48 +28,48 @@ require (
2828
github.com/spf13/pflag v1.0.5
2929
github.com/stretchr/testify v1.4.0
3030
github.com/xyproto/simpleredis v0.0.0-20200201215242-1ff0da2967b4
31-
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7
31+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
3232
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
3333
gomodules.xyz/jsonpatch/v2 v2.0.1
34-
google.golang.org/grpc v1.23.0
35-
k8s.io/api v0.17.7
36-
k8s.io/apiextensions-apiserver v0.17.7
37-
k8s.io/apimachinery v0.17.7
38-
k8s.io/apiserver v0.16.6
39-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
40-
k8s.io/code-generator v0.16.6
41-
k8s.io/component-base v0.16.6
42-
k8s.io/cri-api v0.16.6
34+
google.golang.org/grpc v1.26.0
35+
k8s.io/api v0.18.19
36+
k8s.io/apiextensions-apiserver v0.18.19
37+
k8s.io/apimachinery v0.18.19
38+
k8s.io/apiserver v0.18.19
39+
k8s.io/client-go v0.18.19
40+
k8s.io/code-generator v0.18.19
41+
k8s.io/component-base v0.18.19
42+
k8s.io/cri-api v0.18.19
4343
k8s.io/klog v1.0.0
44-
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
45-
k8s.io/kubernetes v1.16.6
46-
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
47-
sigs.k8s.io/controller-runtime v0.5.7
44+
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
45+
k8s.io/kubernetes v1.18.19
46+
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
47+
sigs.k8s.io/controller-runtime v0.6.5
4848
)
4949

50-
// Replace to match K8s 1.16
50+
// Replace to match K8s 1.18.x
5151
replace (
52-
k8s.io/api => k8s.io/api v0.16.6
53-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.6
54-
k8s.io/apimachinery => k8s.io/apimachinery v0.16.6
55-
k8s.io/apiserver => k8s.io/apiserver v0.16.6
56-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.16.6
57-
k8s.io/client-go => k8s.io/client-go v0.16.6
58-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.6
59-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.6
60-
k8s.io/code-generator => k8s.io/code-generator v0.16.6
61-
k8s.io/component-base => k8s.io/component-base v0.16.6
62-
k8s.io/cri-api => k8s.io/cri-api v0.16.6
63-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.16.6
64-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.16.6
65-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.16.6
66-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.16.6
67-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.16.6
68-
k8s.io/kubectl => k8s.io/kubectl v0.16.6
69-
k8s.io/kubelet => k8s.io/kubelet v0.16.6
70-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.16.6
71-
k8s.io/metrics => k8s.io/metrics v0.16.6
72-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.16.6
52+
k8s.io/api => k8s.io/api v0.18.19
53+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.19
54+
k8s.io/apimachinery => k8s.io/apimachinery v0.18.19
55+
k8s.io/apiserver => k8s.io/apiserver v0.18.19
56+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.19
57+
k8s.io/client-go => k8s.io/client-go v0.18.19
58+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.19
59+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.19
60+
k8s.io/code-generator => k8s.io/code-generator v0.18.19
61+
k8s.io/component-base => k8s.io/component-base v0.18.19
62+
k8s.io/cri-api => k8s.io/cri-api v0.18.19
63+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.19
64+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.19
65+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.19
66+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.19
67+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.19
68+
k8s.io/kubectl => k8s.io/kubectl v0.18.19
69+
k8s.io/kubelet => k8s.io/kubelet v0.18.19
70+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.19
71+
k8s.io/metrics => k8s.io/metrics v0.18.19
72+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.19
7373
)
7474

7575
replace github.com/go-bindata/go-bindata => github.com/go-bindata/go-bindata v3.1.1+incompatible

0 commit comments

Comments
 (0)