kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #123339 from skitt/canonical-json-patch 

Update kustomize, use canonical json-patch v4 import

Kubernetes-commit: da02fdb2aef1b7102526963c91df4992ee5b6a05
This commit is contained in:
Kubernetes Publisher 2024-05-29 08:02:24 -07:00
parent 95029fed24 389193d5df
commit ef03ecfe82
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager
go 1.22.0
require (
k8s.io/apimachinery v0.0.0-20240528083227-d8a3da39bf82
k8s.io/cloud-provider v0.0.0-20240528092528-fb7c7c9eb464
k8s.io/controller-manager v0.0.0-20240528092335-10177bb020f0
k8s.io/apimachinery v0.0.0-20240529203233-63ab494c70e6
k8s.io/cloud-provider v0.0.0-20240529212533-e48ad9d75644
k8s.io/controller-manager v0.0.0-20240529212335-a47cd9393d6f
)
require (
@ -23,11 +23,9 @@ require (
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-20240528084817-bf51cae4d7aa // indirect
k8s.io/component-base v0.0.0-20240529204824-47eccf3754e9 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
replace k8s.io/client-go => k8s.io/client-go v0.0.0-20240528163907-5f741a5d35fe

30
go.sum
View File

@ -1,7 +1,8 @@
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@ -28,10 +29,11 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
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/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@ -79,16 +81,16 @@ 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=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20240528083513-7480c4668141 h1:xzR/CbPgqt7z5Tfld1Bxh1q4LouztWgUZk6y3RrWoTA=
k8s.io/api v0.0.0-20240528083513-7480c4668141/go.mod h1:zxjqHi2uhPFAcVqls8xe2bdAq1XYUsQ+ZiEDXT3iNAM=
k8s.io/apimachinery v0.0.0-20240528083227-d8a3da39bf82 h1:VdBSu9hfIGtUc3VYM0eGHnUch0L2OSH7Tl2prbbAPQU=
k8s.io/apimachinery v0.0.0-20240528083227-d8a3da39bf82/go.mod h1:Tbh97rImB1AK+ESEKVAzaakMJKJaMzpxIdHfDmHds3U=
k8s.io/cloud-provider v0.0.0-20240528092528-fb7c7c9eb464 h1:5VZ9vHJqyXrBDaGvYxE0Ta7IUWMgCsrF7a2kbv86ej4=
k8s.io/cloud-provider v0.0.0-20240528092528-fb7c7c9eb464/go.mod h1:WZffMWUN/j8Sk9//MMRc3aJEXmH7g8Sl1xyA/ItCrhU=
k8s.io/component-base v0.0.0-20240528084817-bf51cae4d7aa h1:1+L1S2gK7/eBRGjU6y31177QOYZhDlNx+Io7ruK0u2Y=
k8s.io/component-base v0.0.0-20240528084817-bf51cae4d7aa/go.mod h1:lhuGni/wsFDYwGe330Fvy+97lQs+VrkEHzKh9FfMbM4=
k8s.io/controller-manager v0.0.0-20240528092335-10177bb020f0 h1:ddBTjCSRMRKR4Jg0cB8YorgqRDKjVotOYKSpnUDdArA=
k8s.io/controller-manager v0.0.0-20240528092335-10177bb020f0/go.mod h1:kRjUzvUq8bvCfmMFo8xGJtiJuu+50O8NtuC+sqS9Zd4=
k8s.io/api v0.0.0-20240529203521-42619825cf01 h1:174qeH6d5KbPVqH3AiRwaPF3KLywgsXd3Urb8fB/brY=
k8s.io/api v0.0.0-20240529203521-42619825cf01/go.mod h1:4/2Gq0qr5DtTHoaH7lfOKW6+ZMSOJwvVvbojJlldJh8=
k8s.io/apimachinery v0.0.0-20240529203233-63ab494c70e6 h1:MyOUvhoFRNxMeVhvXMui7xb2huAQiys6tlcNBzvPSb8=
k8s.io/apimachinery v0.0.0-20240529203233-63ab494c70e6/go.mod h1:ClkKrTMwhmMjgsEHpX2w3F+YKj0ctDOaAxqL7clxG0U=
k8s.io/cloud-provider v0.0.0-20240529212533-e48ad9d75644 h1:B+ej22+pEvEZqhYyVe5vdmLlnecAfpAjPuY3UO8Nl0Y=
k8s.io/cloud-provider v0.0.0-20240529212533-e48ad9d75644/go.mod h1:gpx1QJ/4VdzLoTPIteHZ2z3qRiJGWfT7FZ3F5IkldAw=
k8s.io/component-base v0.0.0-20240529204824-47eccf3754e9 h1:8b7QWPbMuhtGUvrQP8/Qy+qZCObC4kgyruMwJr2dPv4=
k8s.io/component-base v0.0.0-20240529204824-47eccf3754e9/go.mod h1:xq8Vemf3NxQvJTNuYgjx3lCurjF1a5ND//cvSr+CGCs=
k8s.io/controller-manager v0.0.0-20240529212335-a47cd9393d6f h1:dhp5VHzcWiOhsKOBZRKg0L7caDuC+Zy9b52gyCHUSCc=
k8s.io/controller-manager v0.0.0-20240529212335-a47cd9393d6f/go.mod h1:elc9avPUeudPtcA2KCSDLu/+VW3iztJUU9prkw1ZjIE=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=