From ae2d2ac9d5cf2b46a5f4dba162efa8326bf90a99 Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Sun, 23 Apr 2023 22:23:42 -0700 Subject: [PATCH] chore: update cgroups and ttrpc versions - update github.com/containerd/cgroups to v1.1.0 - update github.com/containerd/ttrpc to v1.2.1 Signed-off-by: Akhil Mohan Kubernetes-commit: 76fe41a996ec78d9774e1f1ca9d1d7ec40522f98 --- go.mod | 29 +++++++++++++++-------------- go.sum | 16 +++++----------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 0df5ddd..345c2a4 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager go 1.20 require ( - k8s.io/apimachinery v0.0.0-20230424213653-150a158d04ab - k8s.io/cloud-provider v0.0.0-20230424233035-92da92b0f3aa - k8s.io/controller-manager v0.0.0-20230424232825-8b2543ba4881 + k8s.io/apimachinery v0.0.0 + k8s.io/cloud-provider v0.0.0 + k8s.io/controller-manager v0.0.0 ) require ( @@ -18,13 +18,13 @@ require ( github.com/kr/text v0.2.0 // indirect 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.10.0 // indirect + github.com/rogpeppe/go-internal v1.6.1 // indirect 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/component-base v0.0.0-20230424222119-16ca987d98cf // indirect + k8s.io/component-base v0.0.0 // indirect k8s.io/klog/v2 v2.90.1 // indirect k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -32,13 +32,14 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20230424214213-e93fc0e43e75 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230424213653-0db4b4996746 - k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230424223058-c4a4793144c0 - k8s.io/client-go => k8s.io/client-go v0.0.0-20230424215824-d2b87849d5e7 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230424233035-92da92b0f3aa - k8s.io/component-base => k8s.io/component-base v0.0.0-20230424222119-16ca987d98cf - k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230424222347-3a2f2e020e21 - k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230424232825-8b2543ba4881 - k8s.io/kms => k8s.io/kms v0.0.0-20230424222535-bed3fdf2be1f + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/apiserver => ../apiserver + k8s.io/client-go => ../client-go + k8s.io/cloud-provider => ../cloud-provider + k8s.io/component-base => ../component-base + k8s.io/component-helpers => ../component-helpers + k8s.io/controller-manager => ../controller-manager + k8s.io/kms => ../kms + k8s.io/kube-controller-manager => ../kube-controller-manager ) diff --git a/go.sum b/go.sum index 1d78e8d..c026dab 100644 --- a/go.sum +++ b/go.sum @@ -15,6 +15,7 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -28,8 +29,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -66,23 +67,16 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= 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/api v0.0.0-20230424214213-e93fc0e43e75 h1:kXPRcSwl7Ds7EtqRjRr+OzHuo+2BLrIw+wYCaLYztDI= -k8s.io/apimachinery v0.0.0-20230424213653-0db4b4996746 h1:ofO1clZjPiQbVkg/FVEnt02t0MDldrw/D3xp/unueLw= -k8s.io/apimachinery v0.0.0-20230424213653-0db4b4996746/go.mod h1:XkgM2GGljg5Jr8HtJ4Ua5bORjSjKRWtQjiH+I+FAvz8= -k8s.io/cloud-provider v0.0.0-20230424233035-92da92b0f3aa h1:06hay9wMo5zQliybOgl8fmO+85ft891fAG+xaF8B7e0= -k8s.io/cloud-provider v0.0.0-20230424233035-92da92b0f3aa/go.mod h1:ow0g+7yoCacohwfLDb6ggzA/LIJPqLJqHO6szZvBUCI= -k8s.io/component-base v0.0.0-20230424222119-16ca987d98cf h1:UQQBtagzHxlXGq3cEsf8jysef2Xm9OVbjs0M016tgBI= -k8s.io/component-base v0.0.0-20230424222119-16ca987d98cf/go.mod h1:+X7kNVihvbjhMPGAoNO04783i8V1Wi7ocoX+uIuUk0I= -k8s.io/controller-manager v0.0.0-20230424232825-8b2543ba4881 h1:kgNZDRyDkb1uH04XFIC/qSUNXYn5BLstKgaXcnZ0pDc= -k8s.io/controller-manager v0.0.0-20230424232825-8b2543ba4881/go.mod h1:D/mE8N2rEH+IcTX1hnuJMBDRmkt+uEKZ9iZgeoPh1wE= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=