Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 1bb60ce

Browse files
committed
Bump vendoring
Primary action was bumping the Kubernetes vendoring, other operations were to make it work. * Kubernetes to 1.16.1 * Removed `bitbucket.org/ww/goautoneg` as it is now included in Prometheus * Changed `serializer.DirectCodecFactory` to `serializer.WithoutConversionCodecFactory` in `api/client/clientset/typed/compose/*/compose_client.go` * Moved grpc to v1.23.1 * Ran `dep ensure -update sigs.k8s.io/structured-merge-diff` * Ran `dep ensure -update k8s.io/utils` Signed-off-by: Christopher Crone <[email protected]>
1 parent c8257fb commit 1bb60ce

File tree

668 files changed

+137531
-48101
lines changed

Some content is hidden

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

668 files changed

+137531
-48101
lines changed

Gopkg.lock

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

Gopkg.toml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@
2424

2525
[[constraint]]
2626
name = "k8s.io/apiextensions-apiserver"
27-
version = "kubernetes-1.14.7"
27+
version = "kubernetes-1.16.1"
2828

2929
[[constraint]]
3030
name = "k8s.io/apimachinery"
31-
version = "kubernetes-1.14.7"
31+
version = "kubernetes-1.16.1"
3232

3333
[[constraint]]
3434
name = "k8s.io/client-go"
35-
version = "kubernetes-1.14.7"
35+
version = "kubernetes-1.16.1"
3636

3737
[[constraint]]
3838
name = "k8s.io/apiserver"
39-
version = "kubernetes-1.14.7"
39+
version = "kubernetes-1.16.1"
4040

4141
[[constraint]]
4242
name = "k8s.io/component-base"
43-
version = "kubernetes-1.14.7"
43+
version = "kubernetes-1.16.1"
4444

4545
[[constraint]]
4646
name = "github.com/mitchellh/go-homedir"
@@ -62,12 +62,6 @@
6262
name = "github.com/Masterminds/semver"
6363
version = "v1.3.1"
6464

65-
# Use GitHub mirror to not require Mercurial
66-
[[override]]
67-
name = "bitbucket.org/ww/goautoneg"
68-
source = "https://github.com/adjust/goautoneg"
69-
revision = "d788f35a0315672bc90f50a6145d1252a230ee0d"
70-
7165
# Transitive dependencies that cannot use tip version.
7266
[[override]]
7367
name = "github.com/xeipuuv/gojsonschema"
@@ -88,7 +82,7 @@
8882

8983
[[override]]
9084
name = "google.golang.org/grpc"
91-
version = "~v1.24.0"
85+
version = "v1.23.1"
9286

9387
[[override]]
9488
name = "github.com/ugorji/go"
@@ -100,19 +94,19 @@
10094

10195
[[override]]
10296
name = "k8s.io/api"
103-
version = "kubernetes-1.14.7"
97+
version = "kubernetes-1.16.1"
10498

10599
[[override]]
106100
name = "k8s.io/kubernetes"
107-
version = "v1.14.7"
101+
version = "v1.16.1"
108102

109103
[[override]]
110104
name = "k8s.io/kube-aggregator"
111-
version = "kubernetes-1.14.7"
105+
version = "kubernetes-1.16.1"
112106

113107
[[override]]
114108
name = "k8s.io/kube-openapi"
115-
revision = "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d"
109+
revision = "0270cf2f1c1d995d34b36019a6f65d58e6e33ad4"
116110

117111
[[override]]
118112
name = "github.com/evanphx/json-patch"

api/client/clientset/typed/compose/v1alpha3/compose_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func setConfigDefaults(config *rest.Config) error {
5555
gv := v1alpha3.SchemeGroupVersion
5656
config.GroupVersion = &gv
5757
config.APIPath = "/apis"
58-
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
58+
config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
5959

6060
if config.UserAgent == "" {
6161
config.UserAgent = rest.DefaultKubernetesUserAgent()

api/client/clientset/typed/compose/v1beta1/compose_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func setConfigDefaults(config *rest.Config) error {
5555
gv := v1beta1.SchemeGroupVersion
5656
config.GroupVersion = &gv
5757
config.APIPath = "/apis"
58-
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
58+
config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
5959

6060
if config.UserAgent == "" {
6161
config.UserAgent = rest.DefaultKubernetesUserAgent()

api/client/clientset/typed/compose/v1beta2/compose_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func setConfigDefaults(config *rest.Config) error {
5555
gv := v1beta2.SchemeGroupVersion
5656
config.GroupVersion = &gv
5757
config.APIPath = "/apis"
58-
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
58+
config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
5959

6060
if config.UserAgent == "" {
6161
config.UserAgent = rest.DefaultKubernetesUserAgent()

vendor/bitbucket.org/ww/goautoneg/autoneg.go

Lines changed: 0 additions & 162 deletions
This file was deleted.

vendor/github.com/blang/semver/LICENSE

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

vendor/github.com/blang/semver/json.go

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

0 commit comments

Comments
 (0)