scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76162 from nikhita/bump-gengo

Browse Source 
Bump gengo to avoid large errors in verify logs
This commit is contained in:
Kubernetes Prow Robot
2019-04-05 07:43:32 -07:00
committed by GitHub
parent 16db83b257 8a6449d16f
commit 223f355ba4
35 changed files with 71 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@@ -191,7 +191,7 @@ 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-20181106084056-51747d6e00da
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster v1.2.0-beta.1
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator v0.0.0
@@ -474,7 +474,7 @@ 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-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator

4
go.sum
View File

@@ -489,8 +489,8 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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/heapster v1.2.0-beta.1 h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84=
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82 h1:SHucoAy7lRb+w5oC/hbXyZg+zX+Wftn6hD4tGzHCVqA=

51
pkg/apis/rbac/v1/zz_generated.deepcopy.go generated
View File

@@ -20,57 +20,6 @@ limitations under the License.
package v1
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ClusterRoleBindingBuilder) DeepCopyInto(out *ClusterRoleBindingBuilder) {
*out = *in
in.ClusterRoleBinding.DeepCopyInto(&out.ClusterRoleBinding)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterRoleBindingBuilder.
func (in *ClusterRoleBindingBuilder) DeepCopy() *ClusterRoleBindingBuilder {
if in == nil {
return nil
}
out := new(ClusterRoleBindingBuilder)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *PolicyRuleBuilder) DeepCopyInto(out *PolicyRuleBuilder) {
*out = *in
in.PolicyRule.DeepCopyInto(&out.PolicyRule)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PolicyRuleBuilder.
func (in *PolicyRuleBuilder) DeepCopy() *PolicyRuleBuilder {
if in == nil {
return nil
}
out := new(PolicyRuleBuilder)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *RoleBindingBuilder) DeepCopyInto(out *RoleBindingBuilder) {
*out = *in
in.RoleBinding.DeepCopyInto(&out.RoleBinding)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RoleBindingBuilder.
func (in *RoleBindingBuilder) DeepCopy() *RoleBindingBuilder {
if in == nil {
return nil
}
out := new(RoleBindingBuilder)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in SortableRuleSlice) DeepCopyInto(out *SortableRuleSlice) {
{

2
staging/src/k8s.io/api/go.mod
View File

@@ -275,7 +275,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/apiextensions-apiserver/go.mod
View File

@@ -301,7 +301,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

4
staging/src/k8s.io/apiextensions-apiserver/go.sum
View File

@@ -216,8 +216,8 @@ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

2
staging/src/k8s.io/apimachinery/go.mod
View File

@@ -299,7 +299,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/apiserver/go.mod
View File

@@ -340,7 +340,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/cli-runtime/go.mod
View File

@@ -291,7 +291,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/client-go/go.mod
View File

@@ -299,7 +299,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/cloud-provider/go.mod
View File

@@ -278,7 +278,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/cluster-bootstrap/go.mod
View File

@@ -274,7 +274,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

4
staging/src/k8s.io/code-generator/go.mod
View File

@@ -10,7 +10,7 @@ require (
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 // indirect
gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
)
@@ -279,7 +279,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

4
staging/src/k8s.io/code-generator/go.sum
View File

@@ -11,8 +11,8 @@ gonum.org/v1/gonum v0.0.0-20180726124543-cebdade430cc h1:54pjpwMXgPOGLujOy/QdrSB
gonum.org/v1/gonum v0.0.0-20180726124543-cebdade430cc/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts=
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=

2
staging/src/k8s.io/component-base/go.mod
View File

@@ -276,7 +276,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/cri-api/go.mod
View File

@@ -283,7 +283,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/csi-translation-lib/go.mod
View File

@@ -275,7 +275,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/kube-aggregator/go.mod
View File

@@ -290,7 +290,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

4
staging/src/k8s.io/kube-aggregator/go.sum
View File

@@ -200,8 +200,8 @@ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

2
staging/src/k8s.io/kube-controller-manager/go.mod
View File

@@ -274,7 +274,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/kube-proxy/go.mod
View File

@@ -274,7 +274,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/kube-scheduler/go.mod
View File

@@ -274,7 +274,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/kubelet/go.mod
View File

@@ -274,7 +274,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/metrics/go.mod
View File

@@ -278,7 +278,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

4
staging/src/k8s.io/metrics/go.sum
View File

@@ -72,8 +72,8 @@ 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/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

2
staging/src/k8s.io/node-api/go.mod
View File

@@ -275,7 +275,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

4
staging/src/k8s.io/node-api/go.sum
View File

@@ -74,8 +74,8 @@ 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/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

2
staging/src/k8s.io/sample-apiserver/go.mod
View File

@@ -281,7 +281,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

4
staging/src/k8s.io/sample-apiserver/go.sum
View File

@@ -197,8 +197,8 @@ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

2
staging/src/k8s.io/sample-cli-plugin/go.mod
View File

@@ -276,7 +276,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

2
staging/src/k8s.io/sample-controller/go.mod
View File

@@ -277,7 +277,7 @@ replace (
k8s.io/component-base => ../component-base
k8s.io/cri-api => ../cri-api
k8s.io/csi-translation-lib => ../csi-translation-lib
k8s.io/gengo => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
k8s.io/gengo => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v0.0.0-20190306015804-8e90cee79f82
k8s.io/kube-aggregator => ../kube-aggregator

4
staging/src/k8s.io/sample-controller/go.sum
View File

@@ -75,8 +75,8 @@ 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/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk=
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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=
k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=

49
vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go generated vendored
View File

@@ -40,33 +40,38 @@ type CustomArgs struct {
// This is the comment tag that carries parameters for deep-copy generation.
const (
tagName = "k8s:deepcopy-gen"
interfacesTagName = tagName + ":interfaces"
interfacesNonPointerTagName = tagName + ":nonpointer-interfaces" // attach the DeepCopy<Interface> methods to the
tagEnabledName = "k8s:deepcopy-gen"
interfacesTagName = tagEnabledName + ":interfaces"
interfacesNonPointerTagName = tagEnabledName + ":nonpointer-interfaces" // attach the DeepCopy<Interface> methods to the
)
// Known values for the comment tag.
const tagValuePackage = "package"
// tagValue holds parameters from a tagName tag.
type tagValue struct {
// enabledTagValue holds parameters from a tagName tag.
type enabledTagValue struct {
value string
register bool
}
func extractTag(comments []string) *tagValue {
tagVals := types.ExtractCommentTags("+", comments)[tagName]
func extractEnabledTypeTag(t *types.Type) *enabledTagValue {
comments := append(append([]string{}, t.SecondClosestCommentLines...), t.CommentLines...)
return extractEnabledTag(comments)
}
func extractEnabledTag(comments []string) *enabledTagValue {
tagVals := types.ExtractCommentTags("+", comments)[tagEnabledName]
if tagVals == nil {
// No match for the tag.
return nil
}
// If there are multiple values, abort.
if len(tagVals) > 1 {
klog.Fatalf("Found %d %s tags: %q", len(tagVals), tagName, tagVals)
klog.Fatalf("Found %d %s tags: %q", len(tagVals), tagEnabledName, tagVals)
}
// If we got here we are returning something.
tag := &tagValue{}
tag := &enabledTagValue{}
// Get the primary value.
parts := strings.Split(tagVals[0], ",")
@@ -89,7 +94,7 @@ func extractTag(comments []string) *tagValue {
tag.register = true
}
default:
klog.Fatalf("Unsupported %s param: %q", tagName, parts[i])
klog.Fatalf("Unsupported %s param: %q", tagEnabledName, parts[i])
}
}
return tag
@@ -150,13 +155,13 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
continue
}
ptag := extractTag(pkg.Comments)
ptag := extractEnabledTag(pkg.Comments)
ptagValue := ""
ptagRegister := false
if ptag != nil {
ptagValue = ptag.value
if ptagValue != tagValuePackage {
klog.Fatalf("Package %v: unsupported %s value: %q", i, tagName, ptagValue)
klog.Fatalf("Package %v: unsupported %s value: %q", i, tagEnabledName, ptagValue)
}
ptagRegister = ptag.register
klog.V(5).Infof(" tag.value: %q, tag.register: %t", ptagValue, ptagRegister)
@@ -171,7 +176,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
// explicitly wants generation.
for _, t := range pkg.Types {
klog.V(5).Infof(" considering type %q", t.Name.String())
ttag := extractTag(t.CommentLines)
ttag := extractEnabledTypeTag(t)
if ttag != nil && ttag.value == "true" {
klog.V(5).Infof(" tag=true")
if !copyableType(t) {
@@ -254,7 +259,7 @@ func (g *genDeepCopy) Filter(c *generator.Context, t *types.Type) bool {
// Filter out types not being processed or not copyable within the package.
enabled := g.allTypes
if !enabled {
ttag := extractTag(t.CommentLines)
ttag := extractEnabledTypeTag(t)
if ttag != nil && ttag.value == "true" {
enabled = true
}
@@ -391,7 +396,7 @@ func isRootedUnder(pkg string, roots []string) bool {
func copyableType(t *types.Type) bool {
// If the type opts out of copy-generation, stop.
ttag := extractTag(t.CommentLines)
ttag := extractEnabledTypeTag(t)
if ttag != nil && ttag.value == "false" {
return false
}
@@ -460,12 +465,12 @@ func (g *genDeepCopy) Init(c *generator.Context, w io.Writer) error {
}
func (g *genDeepCopy) needsGeneration(t *types.Type) bool {
tag := extractTag(t.CommentLines)
tag := extractEnabledTypeTag(t)
tv := ""
if tag != nil {
tv = tag.value
if tv != "true" && tv != "false" {
klog.Fatalf("Type %v: unsupported %s value: %q", t, tagName, tag.value)
klog.Fatalf("Type %v: unsupported %s value: %q", t, tagEnabledName, tag.value)
}
}
if g.allTypes && tv == "false" {
@@ -481,8 +486,9 @@ func (g *genDeepCopy) needsGeneration(t *types.Type) bool {
return true
}
func extractInterfacesTag(comments []string) []string {
func extractInterfacesTag(t *types.Type) []string {
var result []string
comments := append(append([]string{}, t.SecondClosestCommentLines...), t.CommentLines...)
values := types.ExtractCommentTags("+", comments)[interfacesTagName]
for _, v := range values {
if len(v) == 0 {
@@ -499,7 +505,8 @@ func extractInterfacesTag(comments []string) []string {
return result
}
func extractNonPointerInterfaces(comments []string) (bool, error) {
func extractNonPointerInterfaces(t *types.Type) (bool, error) {
comments := append(append([]string{}, t.SecondClosestCommentLines...), t.CommentLines...)
values := types.ExtractCommentTags("+", comments)[interfacesNonPointerTagName]
if len(values) == 0 {
return false, nil
@@ -518,7 +525,7 @@ func (g *genDeepCopy) deepCopyableInterfacesInner(c *generator.Context, t *types
return nil, nil
}
intfs := extractInterfacesTag(append(t.SecondClosestCommentLines, t.CommentLines...))
intfs := extractInterfacesTag(t)
var ts []*types.Type
for _, intf := range intfs {
@@ -557,7 +564,7 @@ func (g *genDeepCopy) deepCopyableInterfaces(c *generator.Context, t *types.Type
TypeSlice(result).Sort() // we need a stable sorting because it determines the order in generation
nonPointerReceiver, err := extractNonPointerInterfaces(append(t.SecondClosestCommentLines, t.CommentLines...))
nonPointerReceiver, err := extractNonPointerInterfaces(t)
if err != nil {
return nil, false, err
}

2
vendor/k8s.io/gengo/parser/parse.go generated vendored
View File

@@ -403,7 +403,7 @@ func (b *Builder) typeCheckPackage(pkgPath importPathString) (*tc.Package, error
}
parsedFiles, ok := b.parsed[pkgPath]
if !ok {
return nil, fmt.Errorf("No files for pkg %q: %#v", pkgPath, b.parsed)
return nil, fmt.Errorf("No files for pkg %q", pkgPath)
}
files := make([]*ast.File, len(parsedFiles))
for i := range parsedFiles {

2
vendor/modules.txt vendored
View File

@@ -1633,7 +1633,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-20181106084056-51747d6e00da => k8s.io/gengo v0.0.0-20181106084056-51747d6e00da
# k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af => k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af
k8s.io/gengo/args
k8s.io/gengo/examples/deepcopy-gen/generators
k8s.io/gengo/examples/defaulter-gen/generators