Skip to content

Commit f4c1455

Browse files
apelisseapelisse
committed
Update SMD to v4.0.1 and kube-openapi
1 parent 7740b81 commit f4c1455

File tree

107 files changed

+208
-229
lines changed

Some content is hidden

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

107 files changed

+208
-229
lines changed

‎LICENSES/vendor/sigs.k8s.io/structured-merge-diff/v3/LICENSE‎ renamed to ‎LICENSES/vendor/sigs.k8s.io/structured-merge-diff/v4/LICENSE‎

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

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ require (
128128
k8s.io/klog/v2 v2.2.0
129129
k8s.io/kube-aggregator v0.0.0
130130
k8s.io/kube-controller-manager v0.0.0
131-
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
131+
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
132132
k8s.io/kube-proxy v0.0.0
133133
k8s.io/kube-scheduler v0.0.0
134134
k8s.io/kubectl v0.0.0
@@ -478,7 +478,7 @@ replace (
478478
k8s.io/klog/v2 => k8s.io/klog/v2 v2.2.0
479479
k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator
480480
k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager
481-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
481+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
482482
k8s.io/kube-proxy => ./staging/src/k8s.io/kube-proxy
483483
k8s.io/kube-scheduler => ./staging/src/k8s.io/kube-scheduler
484484
k8s.io/kubectl => ./staging/src/k8s.io/kubectl
@@ -498,7 +498,7 @@ replace (
498498
rsc.io/pdf => rsc.io/pdf v0.1.1
499499
sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9
500500
sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible
501-
sigs.k8s.io/structured-merge-diff/v3 => sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba
501+
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.0.1
502502
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0
503503
vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc
504504
)

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,8 +552,8 @@ k8s.io/heapster v1.2.0-beta.1 h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84=
552552
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
553553
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
554554
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
555-
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 h1:5NC2ITmvg8RoxoH0wgmL4zn4VZqXGsKbxrikjaQx6s4=
556-
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9/go.mod h1:bfCVj+qXcEaE5SCvzBaqpOySr6tuCcpPKqF6HD8nyCw=
555+
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ=
556+
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
557557
k8s.io/system-validators v1.1.2 h1:0xzEb0PqnDnUOuf/2E/gaJBOBN7j+qf0LIn12jw3oc4=
558558
k8s.io/system-validators v1.1.2/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
559559
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
@@ -568,8 +568,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9 h1:rusRLrDhjBp6aY
568568
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0=
569569
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
570570
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
571-
sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba h1:AAbnc5KQuTWKuh2QSnyghKIOTFzB0Jayv7/OFDn3Cy4=
572-
sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba/go.mod h1:V06abazjHneE37ZdSY/UUwPVgcJMKI/jU5XGUjgIKoc=
571+
sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA=
572+
sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
573573
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
574574
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
575575
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc=

‎staging/src/k8s.io/api/go.sum‎

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

‎staging/src/k8s.io/apiextensions-apiserver/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
k8s.io/code-generator v0.0.0
2929
k8s.io/component-base v0.0.0
3030
k8s.io/klog/v2 v2.2.0
31-
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
31+
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
3232
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
3333
sigs.k8s.io/yaml v1.2.0
3434
)

‎staging/src/k8s.io/apiextensions-apiserver/go.sum‎

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

‎staging/src/k8s.io/apimachinery/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ require (
3333
gopkg.in/inf.v0 v0.9.1
3434
gopkg.in/yaml.v2 v2.2.8
3535
k8s.io/klog/v2 v2.2.0
36-
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
37-
sigs.k8s.io/structured-merge-diff/v3 v3.0.1-0.20200706213357-43c19bbb7fba
36+
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
37+
sigs.k8s.io/structured-merge-diff/v4 v4.0.1
3838
sigs.k8s.io/yaml v1.2.0
3939
)
4040

‎staging/src/k8s.io/apimachinery/go.sum‎

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

‎staging/src/k8s.io/apimachinery/pkg/runtime/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ go_library(
7171
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
7272
"//vendor/github.com/gogo/protobuf/proto:go_default_library",
7373
"//vendor/k8s.io/klog/v2:go_default_library",
74-
"//vendor/sigs.k8s.io/structured-merge-diff/v3/value:go_default_library",
74+
"//vendor/sigs.k8s.io/structured-merge-diff/v4/value:go_default_library",
7575
],
7676
)
7777

‎staging/src/k8s.io/apimachinery/pkg/runtime/converter.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"k8s.io/apimachinery/pkg/conversion"
3232
"k8s.io/apimachinery/pkg/util/json"
3333
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
34-
"sigs.k8s.io/structured-merge-diff/v3/value"
34+
"sigs.k8s.io/structured-merge-diff/v4/value"
3535

3636
"k8s.io/klog/v2"
3737
)

0 commit comments

Comments
 (0)