From 7408ebfdcad690fb6b42117ffcfc2b2fda9e2433 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 9 Jul 2019 17:31:32 +0200 Subject: [PATCH] Bump(k8s.io/kube-openapi): aggregator: merge x-kubernetes-group-version-kind slices --- go.mod | 10 +++++----- vendor/modules.txt | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index db5817d0195..6653a086704 100644 --- a/go.mod +++ b/go.mod @@ -163,12 +163,12 @@ require ( k8s.io/component-base v0.0.0 k8s.io/cri-api v0.0.0 k8s.io/csi-translation-lib v0.0.0 - k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af + k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 k8s.io/heapster v1.2.0-beta.1 k8s.io/klog v0.3.1 k8s.io/kube-aggregator v0.0.0 k8s.io/kube-controller-manager v0.0.0 - k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 + k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 k8s.io/kube-proxy v0.0.0 k8s.io/kube-scheduler v0.0.0 k8s.io/kubectl v0.0.0 @@ -445,12 +445,12 @@ replace ( k8s.io/component-base => ./staging/src/k8s.io/component-base k8s.io/cri-api => ./staging/src/k8s.io/cri-api k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib - k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af + k8s.io/gengo => k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 k8s.io/klog => k8s.io/klog v0.3.1 k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager - k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 + k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 k8s.io/kube-proxy => ./staging/src/k8s.io/kube-proxy k8s.io/kube-scheduler => ./staging/src/k8s.io/kube-scheduler k8s.io/kubectl => ./staging/src/k8s.io/kubectl @@ -469,7 +469,7 @@ replace ( modernc.org/strutil => modernc.org/strutil v1.0.0 modernc.org/xc => modernc.org/xc v1.0.0 sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible - sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2 + sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0 vbom.ml/util => vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 49b71cfbc02..e7cd544f7f0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1574,7 +1574,7 @@ k8s.io/cri-api/pkg/apis/testing # k8s.io/csi-translation-lib v0.0.0 => ./staging/src/k8s.io/csi-translation-lib k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af +# k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 => k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 k8s.io/gengo/args k8s.io/gengo/examples/deepcopy-gen/generators k8s.io/gengo/examples/defaulter-gen/generators @@ -1609,6 +1609,7 @@ k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration k8s.io/kube-aggregator/pkg/client/informers/internalversion/apiregistration/internalversion k8s.io/kube-aggregator/pkg/client/informers/internalversion/internalinterfaces k8s.io/kube-aggregator/pkg/client/listers/apiregistration/internalversion +k8s.io/kube-aggregator/pkg/client/openapi k8s.io/kube-aggregator/pkg/cmd/server k8s.io/kube-aggregator/pkg/controllers k8s.io/kube-aggregator/pkg/controllers/autoregister @@ -1620,7 +1621,7 @@ k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest # k8s.io/kube-controller-manager v0.0.0 => ./staging/src/k8s.io/kube-controller-manager k8s.io/kube-controller-manager/config/v1alpha1 -# k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 +# k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 => k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 k8s.io/kube-openapi/cmd/openapi-gen k8s.io/kube-openapi/cmd/openapi-gen/args k8s.io/kube-openapi/pkg/aggregator @@ -1754,7 +1755,7 @@ sigs.k8s.io/kustomize/pkg/transformers sigs.k8s.io/kustomize/pkg/transformers/config sigs.k8s.io/kustomize/pkg/transformers/config/defaultconfig sigs.k8s.io/kustomize/pkg/types -# sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2 => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2 +# sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e => sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e sigs.k8s.io/structured-merge-diff/fieldpath sigs.k8s.io/structured-merge-diff/merge sigs.k8s.io/structured-merge-diff/schema