Updated github.com/gogo/protobuf from SHA to nearest-pinnable tag (v1.0.0), as part of dependency management cleanup: #79234

Kubernetes-commit: fe59ee8aaf8c7399476d286349caca9e3c05c522
This commit is contained in:
Vallery Lancey 2019-07-02 21:44:06 -07:00 committed by Kubernetes Publisher
parent 3b91810e58
commit 6e15e9a893
7 changed files with 26 additions and 31 deletions

19
go.mod
View File

@ -19,7 +19,7 @@ require (
github.com/evanphx/json-patch v4.2.0+incompatible
github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4 // indirect
github.com/go-openapi/spec v0.19.2
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415
github.com/gogo/protobuf v1.0.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/google/gofuzz v1.0.0
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d
@ -52,10 +52,10 @@ require (
gopkg.in/square/go-jose.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.2
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20190703165250-25c1e1427dc7
k8s.io/apimachinery v0.0.0-20190703161233-99a332dfcf06
k8s.io/client-go v0.0.0-20190703165502-ac1a9799d0d2
k8s.io/component-base v0.0.0-20190703045856-e0653b7050bb
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/klog v0.3.1
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
@ -70,8 +70,9 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/api => k8s.io/api v0.0.0-20190703165250-25c1e1427dc7
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190703161233-99a332dfcf06
k8s.io/client-go => k8s.io/client-go v0.0.0-20190703165502-ac1a9799d0d2
k8s.io/component-base => k8s.io/component-base v0.0.0-20190703045856-e0653b7050bb
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
)

8
go.sum
View File

@ -50,8 +50,8 @@ github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCr
github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE=
github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 h1:WSBJMqJbLxsn+bTCPyPYZfqHdJmc8MK4wrBjMft6BAM=
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.0.0 h1:2jyBKDKU/8v3v2xVR2PtiWQviFUyiaGk2rpfyFT8rTM=
github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=
@ -198,10 +198,6 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/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/api v0.0.0-20190703165250-25c1e1427dc7/go.mod h1:7p+zgSgANdP1liNVyA7n1nAE2eItF7Ze2AILKy/ncLM=
k8s.io/apimachinery v0.0.0-20190703161233-99a332dfcf06/go.mod h1:T1Vra67tZppnhHB3gqfn8/pmTb9EMVZXLvaevIRo6cU=
k8s.io/client-go v0.0.0-20190703165502-ac1a9799d0d2/go.mod h1:Q/D82H4nqpjp7F95WF+ygfRXKNpRKTB7reOXZOnPoDE=
k8s.io/component-base v0.0.0-20190703045856-e0653b7050bb/go.mod h1:lpQuE+oizrqo4Hw10LdZtrtsNR+Oq8BK9LBKFcVuoA0=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

View File

@ -44,7 +44,7 @@ import k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime"
import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
import sortkeys "github.com/gogo/protobuf/sortkeys"
import strings "strings"
import reflect "reflect"
@ -228,7 +228,7 @@ func (m *Event) MarshalTo(dAtA []byte) (int, error) {
for k := range m.Annotations {
keysForAnnotations = append(keysForAnnotations, string(k))
}
github_com_gogo_protobuf_sortkeys.Strings(keysForAnnotations)
sortkeys.Strings(keysForAnnotations)
for _, k := range keysForAnnotations {
dAtA[i] = 0x7a
i++
@ -837,7 +837,7 @@ func (this *Event) String() string {
for k := range this.Annotations {
keysForAnnotations = append(keysForAnnotations, k)
}
github_com_gogo_protobuf_sortkeys.Strings(keysForAnnotations)
sortkeys.Strings(keysForAnnotations)
mapStringForAnnotations := "map[string]string{"
for _, k := range keysForAnnotations {
mapStringForAnnotations += fmt.Sprintf("%v: %v,", k, this.Annotations[k])

View File

@ -44,7 +44,7 @@ import k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime"
import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
import sortkeys "github.com/gogo/protobuf/sortkeys"
import strings "strings"
import reflect "reflect"
@ -246,7 +246,7 @@ func (m *Event) MarshalTo(dAtA []byte) (int, error) {
for k := range m.Annotations {
keysForAnnotations = append(keysForAnnotations, string(k))
}
github_com_gogo_protobuf_sortkeys.Strings(keysForAnnotations)
sortkeys.Strings(keysForAnnotations)
for _, k := range keysForAnnotations {
dAtA[i] = 0x8a
i++
@ -855,7 +855,7 @@ func (this *Event) String() string {
for k := range this.Annotations {
keysForAnnotations = append(keysForAnnotations, k)
}
github_com_gogo_protobuf_sortkeys.Strings(keysForAnnotations)
sortkeys.Strings(keysForAnnotations)
mapStringForAnnotations := "map[string]string{"
for _, k := range keysForAnnotations {
mapStringForAnnotations += fmt.Sprintf("%v: %v,", k, this.Annotations[k])

View File

@ -44,7 +44,7 @@ import k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime"
import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
import sortkeys "github.com/gogo/protobuf/sortkeys"
import strings "strings"
import reflect "reflect"
@ -246,7 +246,7 @@ func (m *Event) MarshalTo(dAtA []byte) (int, error) {
for k := range m.Annotations {
keysForAnnotations = append(keysForAnnotations, string(k))
}
github_com_gogo_protobuf_sortkeys.Strings(keysForAnnotations)
sortkeys.Strings(keysForAnnotations)
for _, k := range keysForAnnotations {
dAtA[i] = 0x8a
i++
@ -861,7 +861,7 @@ func (this *Event) String() string {
for k := range this.Annotations {
keysForAnnotations = append(keysForAnnotations, k)
}
github_com_gogo_protobuf_sortkeys.Strings(keysForAnnotations)
sortkeys.Strings(keysForAnnotations)
mapStringForAnnotations := "map[string]string{"
for _, k := range keysForAnnotations {
mapStringForAnnotations += fmt.Sprintf("%v: %v,", k, this.Annotations[k])

View File

@ -38,7 +38,7 @@ import math "math"
import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
import sortkeys "github.com/gogo/protobuf/sortkeys"
import strings "strings"
import reflect "reflect"
@ -247,7 +247,7 @@ func (m *PodSpec) MarshalTo(dAtA []byte) (int, error) {
for k := range m.NodeSelector {
keysForNodeSelector = append(keysForNodeSelector, string(k))
}
github_com_gogo_protobuf_sortkeys.Strings(keysForNodeSelector)
sortkeys.Strings(keysForNodeSelector)
for _, k := range keysForNodeSelector {
dAtA[i] = 0x3a
i++
@ -556,7 +556,7 @@ func (this *PodSpec) String() string {
for k := range this.NodeSelector {
keysForNodeSelector = append(keysForNodeSelector, k)
}
github_com_gogo_protobuf_sortkeys.Strings(keysForNodeSelector)
sortkeys.Strings(keysForNodeSelector)
mapStringForNodeSelector := "map[string]string{"
for _, k := range keysForNodeSelector {
mapStringForNodeSelector += fmt.Sprintf("%v: %v,", k, this.NodeSelector[k])

View File

@ -37,10 +37,8 @@ import proto "github.com/gogo/protobuf/proto"
import fmt "fmt"
import math "math"
import (
context "golang.org/x/net/context"
grpc "google.golang.org/grpc"
)
import context "golang.org/x/net/context"
import grpc "google.golang.org/grpc"
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal