From 321be866e1707ad7e96179b2b6c87f40bb6fc110 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Thu, 11 May 2023 21:25:46 +0530 Subject: [PATCH 1/2] etcd depdencies are updated to v3.5.9 Signed-off-by: Humble Chirammal Kubernetes-commit: ae749238786f0c7b32a5291dd52ca31ea7c4fd18 --- go.mod | 21 ++++++++++++++------- go.sum | 8 ++------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index aee81b0..63b9380 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ module k8s.io/kube-proxy go 1.20 require ( - k8s.io/apimachinery v0.0.0-20230515165651-676b368d6d0d - k8s.io/component-base v0.0.0-20230515171225-a6ee97d851d0 + k8s.io/apimachinery v0.0.0 + k8s.io/component-base v0.0.0 ) require ( @@ -19,21 +19,28 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect + go.etcd.io/etcd/api/v3 v3.5.9 + go.etcd.io/etcd/client/pkg/v3 v3.5.8 + go.etcd.io/etcd/client/v3 v3.5.9 + go.etcd.io/etcd/pkg/v3 v3.5.9 + go.etcd.io/etcd/raft/v3 v3.5.9 + go.etcd.io/etcd/server/v3 v3.5.9 golang.org/x/net v0.9.0 // indirect golang.org/x/text v0.9.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/klog/v2 v2.100.1 // indirect - k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect + k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20230515170018-7c333a3dc11f - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230515165651-676b368d6d0d - k8s.io/client-go => k8s.io/client-go v0.0.0-20230515170425-79d967dc5240 - k8s.io/component-base => k8s.io/component-base v0.0.0-20230515171225-a6ee97d851d0 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base + k8s.io/kube-proxy => ../kube-proxy ) diff --git a/go.sum b/go.sum index b0f7f40..825cd6d 100644 --- a/go.sum +++ b/go.sum @@ -78,14 +78,10 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -k8s.io/apimachinery v0.0.0-20230515165651-676b368d6d0d h1:5fSzeLJEq+kHStNB5fKdUTmCb6hWNLmXNHyDC5D/Nro= -k8s.io/apimachinery v0.0.0-20230515165651-676b368d6d0d/go.mod h1:eDu1JolS718v1gie0idFNNduKVOGsC1CksrbgSWNoLE= -k8s.io/component-base v0.0.0-20230515171225-a6ee97d851d0 h1:93UA2eZW2SWQNmIIEWYP0HRX/z2DpOwqsl6M61PMkK4= -k8s.io/component-base v0.0.0-20230515171225-a6ee97d851d0/go.mod h1:acT6XCsYkDNo5dK6uoACNr56WsoX5PYQFjCN3v2pGtA= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= -k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 h1:xMMXJlJbsU8w3V5N2FLDQ8YgU8s1EoULdbQBcAeNJkY= +k8s.io/utils v0.0.0-20230313181309-38a27ef9d749/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= From e832e202358f01551d71165fc74dcd7aaabc1d0c Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Thu, 11 May 2023 21:58:39 +0530 Subject: [PATCH 2/2] update vendor dependencies for the change Signed-off-by: Humble Chirammal Kubernetes-commit: dcefc42b35acb229fcf95a172bfd635ee615d1be --- go.mod | 6 ------ 1 file changed, 6 deletions(-) diff --git a/go.mod b/go.mod index 63b9380..f30a38a 100644 --- a/go.mod +++ b/go.mod @@ -19,12 +19,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect - go.etcd.io/etcd/api/v3 v3.5.9 - go.etcd.io/etcd/client/pkg/v3 v3.5.8 - go.etcd.io/etcd/client/v3 v3.5.9 - go.etcd.io/etcd/pkg/v3 v3.5.9 - go.etcd.io/etcd/raft/v3 v3.5.9 - go.etcd.io/etcd/server/v3 v3.5.9 golang.org/x/net v0.9.0 // indirect golang.org/x/text v0.9.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect