From 7f34571e04687523958cfbcfae60bfcc8271e440 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 8 Apr 2019 10:16:51 -0700 Subject: [PATCH] Merge pull request #76197 from liggitt/generated-vendor Mark staging go module files as generated, add script to lint dependencies Kubernetes-commit: 8a2f8e69ed0cfaae38cf7a40cc40b71a36ff319b --- Godeps/Godeps.json | 8 ++++---- go.mod | 35 +++++++++-------------------------- go.sum | 4 ++++ 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index aa356318..6a75f446 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -200,19 +200,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "8fc60343b75c" + "Rev": "b1350b9e3bc2" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "ba051b3c4d9d" + "Rev": "3115ef20f323" }, { "ImportPath": "k8s.io/client-go", - "Rev": "a18eda0c053a" + "Rev": "b7e8408f656e" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "9a4d48088f6a" + "Rev": "e317c52975f8" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index f3fac1b7..812294fb 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ module k8s.io/sample-controller go 1.12 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/code-generator v0.0.0 + k8s.io/api v0.0.0-20190408172450-b1350b9e3bc2 + k8s.io/apimachinery v0.0.0-20190408172355-3115ef20f323 + k8s.io/client-go v0.0.0-20190408172623-b7e8408f656e + k8s.io/code-generator v0.0.0-20190408172253-e317c52975f8 k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 ) @@ -61,31 +61,14 @@ replace ( gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.0 gopkg.in/tomb.v1 => gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.1 - k8s.io/api => ../api - k8s.io/apiextensions-apiserver => ../apiextensions-apiserver - k8s.io/apimachinery => ../apimachinery - k8s.io/apiserver => ../apiserver - k8s.io/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/cloud-provider => ../cloud-provider - k8s.io/cluster-bootstrap => ../cluster-bootstrap - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/cri-api => ../cri-api - k8s.io/csi-translation-lib => ../csi-translation-lib + k8s.io/api => k8s.io/api v0.0.0-20190408172450-b1350b9e3bc2 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190408172355-3115ef20f323 + k8s.io/client-go => k8s.io/client-go v0.0.0-20190408172623-b7e8408f656e + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190408172253-e317c52975f8 + k8s.io/component-base => k8s.io/component-base v0.0.0-20190408172944-383e7fa4e530 k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 - k8s.io/kube-aggregator => ../kube-aggregator - k8s.io/kube-controller-manager => ../kube-controller-manager k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 - k8s.io/kube-proxy => ../kube-proxy - k8s.io/kube-scheduler => ../kube-scheduler - k8s.io/kubelet => ../kubelet - k8s.io/metrics => ../metrics - k8s.io/node-api => ../node-api - k8s.io/sample-apiserver => ../sample-apiserver - k8s.io/sample-cli-plugin => ../sample-cli-plugin - k8s.io/sample-controller => ../sample-controller k8s.io/utils => k8s.io/utils v0.0.0-20190221042446-c2654d5206da modernc.org/cc => modernc.org/cc v1.0.0 modernc.org/golex => modernc.org/golex v1.0.0 diff --git a/go.sum b/go.sum index 78973dc1..e71a62ba 100644 --- a/go.sum +++ b/go.sum @@ -75,6 +75,10 @@ gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +k8s.io/api v0.0.0-20190408172450-b1350b9e3bc2/go.mod h1:veStiK0yF1nHrr8JiIMWMFtxkvM2/N0btMIbquIFfr4= +k8s.io/apimachinery v0.0.0-20190408172355-3115ef20f323/go.mod h1:GzZQJQYc7AbeSKysWLEDM28YwWcSq2MnMQQwplZgVys= +k8s.io/client-go v0.0.0-20190408172623-b7e8408f656e/go.mod h1:IsByQTKIW25BOC6wV+sXFJLRaZQk0lWB2tmIRlIaW1Y= +k8s.io/code-generator v0.0.0-20190408172253-e317c52975f8/go.mod h1:o2qZsVoc+Na1s43gyhhXQhH9ZPA/FmTXLmGtoKcUsXI= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk= k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 h1:SHucoAy7lRb+w5oC/hbXyZg+zX+Wftn6hD4tGzHCVqA=