From 9a4df6c472a9057ec570242390b118a9f9c616bf 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 | 33 +++++++++++++++++---------------- go.sum | 14 ++------------ 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index bda52f9f0..c32cbdfb9 100644 --- a/go.mod +++ b/go.mod @@ -20,10 +20,10 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.2 - go.etcd.io/etcd/api/v3 v3.5.8 + 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.8 - go.etcd.io/etcd/server/v3 v3.5.8 + go.etcd.io/etcd/client/v3 v3.5.9 + go.etcd.io/etcd/server/v3 v3.5.9 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 go.opentelemetry.io/otel v1.10.0 @@ -41,14 +41,14 @@ require ( google.golang.org/protobuf v1.30.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api v0.0.0-20230515170018-7c333a3dc11f - k8s.io/apimachinery v0.0.0-20230515165651-676b368d6d0d - k8s.io/client-go v0.0.0-20230515170425-79d967dc5240 - k8s.io/component-base v0.0.0-20230515171225-a6ee97d851d0 + 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/v2 v2.100.1 - k8s.io/kms v0.0.0-20230515171440-26b86bf5b237 + k8s.io/kms v0.0.0 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f - k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 + k8s.io/utils v0.0.0-20230313181309-38a27ef9d749 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd sigs.k8s.io/structured-merge-diff/v4 v4.2.3 @@ -106,8 +106,8 @@ require ( github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.etcd.io/etcd/client/v2 v2.305.8 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.8 // indirect - go.etcd.io/etcd/raft/v3 v3.5.8 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.9 // indirect + go.etcd.io/etcd/raft/v3 v3.5.9 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect @@ -124,9 +124,10 @@ require ( ) 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/kms => k8s.io/kms v0.0.0-20230515171440-26b86bf5b237 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/component-base => ../component-base + k8s.io/kms => ../kms ) diff --git a/go.sum b/go.sum index 35ab17f41..bf8c69166 100644 --- a/go.sum +++ b/go.sum @@ -875,22 +875,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20230515170018-7c333a3dc11f h1:e1OF9lTwLdQODxTa7UikhCBEcXU1og43HfFG/GE0Tp4= -k8s.io/api v0.0.0-20230515170018-7c333a3dc11f/go.mod h1:07TYszjmJzfXXsDPhuBp7Q/bEkD+5fpSvdtSxHWxIkQ= -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/client-go v0.0.0-20230515170425-79d967dc5240 h1:x/1X9UjtvkHiwUNpUhEg8aElBmaLXC+1pK4Xxs5U33A= -k8s.io/client-go v0.0.0-20230515170425-79d967dc5240/go.mod h1:t+LHgTB0TVZG2C2JrQHJjDcOK3yUPDPVG/54drLaOcg= -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/kms v0.0.0-20230515171440-26b86bf5b237 h1:JlrZVTTxgYAI5l4Q37ixsBCJDyKFl2ILsYYUIQmM5io= -k8s.io/kms v0.0.0-20230515171440-26b86bf5b237/go.mod h1:eCBOvRZJgxKJFhUTdutY8faeo2iT7tF8aBRivF2oiFs= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= -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= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= From a4a8603d0adbe9b400ca104e7ee432d0736b812d 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 | 4 ++-- go.sum | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index c32cbdfb9..549976cba 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.2 go.etcd.io/etcd/api/v3 v3.5.9 - go.etcd.io/etcd/client/pkg/v3 v3.5.8 + go.etcd.io/etcd/client/pkg/v3 v3.5.9 go.etcd.io/etcd/client/v3 v3.5.9 go.etcd.io/etcd/server/v3 v3.5.9 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 @@ -105,7 +105,7 @@ require ( github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect go.etcd.io/bbolt v1.3.7 // indirect - go.etcd.io/etcd/client/v2 v2.305.8 // indirect + go.etcd.io/etcd/client/v2 v2.305.9 // indirect go.etcd.io/etcd/pkg/v3 v3.5.9 // indirect go.etcd.io/etcd/raft/v3 v3.5.9 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect diff --git a/go.sum b/go.sum index bf8c69166..99c59ed73 100644 --- a/go.sum +++ b/go.sum @@ -386,20 +386,20 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.etcd.io/etcd/api/v3 v3.5.8 h1:Zf44zJszoU7zRV0X/nStPenegNXoFDWcB/MwrJbA+L4= -go.etcd.io/etcd/api/v3 v3.5.8/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= -go.etcd.io/etcd/client/pkg/v3 v3.5.8 h1:tPp9YRn/UBFAHdhOQUII9eUs7aOK35eulpMhX4YBd+M= -go.etcd.io/etcd/client/pkg/v3 v3.5.8/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= -go.etcd.io/etcd/client/v2 v2.305.8 h1:IGp9Ozt8awy3qRTXSIYJd/o/cr4oUyrm9MF1RJ2dr/c= -go.etcd.io/etcd/client/v2 v2.305.8/go.mod h1:ZlAsxDK5/10I6xVHhFo9zinCMr/DDLKFetDDXlzKwqE= -go.etcd.io/etcd/client/v3 v3.5.8 h1:B6ngTKZSWWowHEoaucOKHQR/AtZKaoHLiUpWxOLG4l4= -go.etcd.io/etcd/client/v3 v3.5.8/go.mod h1:idZYIPVkttBJBiRigkB5EM0MmEyx8jcl18zCV3F5noc= -go.etcd.io/etcd/pkg/v3 v3.5.8 h1:hz6w5Cb4p7dbt642m8Y35Ts9yWPWUCymc3v4Z/aiGEU= -go.etcd.io/etcd/pkg/v3 v3.5.8/go.mod h1:C17MJkZHJIyJV+wWWx6Jz6YS6BfdkOnUkSwT9uuEO7s= -go.etcd.io/etcd/raft/v3 v3.5.8 h1:wM4IAfiY1+vrCAkUicIOzkyjpV9MawnAul2KvxeMgy4= -go.etcd.io/etcd/raft/v3 v3.5.8/go.mod h1:W6P5WxtOMfYNdLSEJX3vc8Pg6LOt+ewI9UCFKcnIexA= -go.etcd.io/etcd/server/v3 v3.5.8 h1:eK9fU6Pd6IJD1k0u4zAq1NZsSsEOOimlP3kIkpcQrho= -go.etcd.io/etcd/server/v3 v3.5.8/go.mod h1:1y2ahPOrlE4pzVV5+rBCDur7QQcEP0MNUPO2dyzwjso= +go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs= +go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= +go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE= +go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= +go.etcd.io/etcd/client/v2 v2.305.9 h1:YZ2OLi0OvR0H75AcgSUajjd5uqKDKocQUqROTG11jIo= +go.etcd.io/etcd/client/v2 v2.305.9/go.mod h1:0NBdNx9wbxtEQLwAQtrDHwx58m02vXpDcgSYI2seohQ= +go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E= +go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA= +go.etcd.io/etcd/pkg/v3 v3.5.9 h1:6R2jg/aWd/zB9+9JxmijDKStGJAPFsX3e6BeJkMi6eQ= +go.etcd.io/etcd/pkg/v3 v3.5.9/go.mod h1:BZl0SAShQFk0IpLWR78T/+pyt8AruMHhTNNX73hkNVY= +go.etcd.io/etcd/raft/v3 v3.5.9 h1:ZZ1GIHoUlHsn0QVqiRysAm3/81Xx7+i2d7nSdWxlOiI= +go.etcd.io/etcd/raft/v3 v3.5.9/go.mod h1:WnFkqzFdZua4LVlVXQEGhmooLeyS7mqzS4Pf4BCVqXg= +go.etcd.io/etcd/server/v3 v3.5.9 h1:vomEmmxeztLtS5OEH7d0hBAg4cjVIu9wXuNzUZx2ZA0= +go.etcd.io/etcd/server/v3 v3.5.9/go.mod h1:GgI1fQClQCFIzuVjlvdbMxNbnISt90gdfYyqiAIt65g= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=