Merge pull request #119334 from kmala/serverapply
update the dependency sigs.k8s.io/structured-merge-diff/v4 to latest tag Kubernetes-commit: cf8f9a8d07770352ec0e976ebac77dffa92f0b04
This commit is contained in:
commit
374e5f4524
28
go.mod
28
go.mod
|
|
@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager
|
|||
go 1.20
|
||||
|
||||
require (
|
||||
k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013
|
||||
k8s.io/cloud-provider v0.0.0-20230901081224-4b81b289a1c4
|
||||
k8s.io/controller-manager v0.0.0-20230901080318-c917325a83f5
|
||||
k8s.io/apimachinery v0.0.0-20230907021858-82362bc34ae0
|
||||
k8s.io/cloud-provider v0.0.0-20230907045454-3d28e78db9bc
|
||||
k8s.io/controller-manager v0.0.0-20230907044854-f814d6e6e7b2
|
||||
)
|
||||
|
||||
require (
|
||||
|
|
@ -23,21 +23,21 @@ 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-20230901051635-6a97c85314ee // indirect
|
||||
k8s.io/component-base v0.0.0-20230907030149-8deb88b04e9a // indirect
|
||||
k8s.io/klog/v2 v2.100.1 // indirect
|
||||
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // 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/structured-merge-diff/v4 v4.3.0 // indirect
|
||||
)
|
||||
|
||||
replace (
|
||||
k8s.io/api => k8s.io/api v0.0.0-20230901043045-d68a18351c00
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230901054518-e74fcfcb78ed
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20230901044724-5e5ba6b91d64
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230901081224-4b81b289a1c4
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20230901051635-6a97c85314ee
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230901052700-b3425863cef8
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230901080318-c917325a83f5
|
||||
k8s.io/kms => k8s.io/kms v0.0.0-20230901053518-2b0cdaf495d2
|
||||
k8s.io/api => k8s.io/api v0.0.0-20230907022840-7f63b7b88cb6
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230907021858-82362bc34ae0
|
||||
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230907032102-ea59eb345547
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20230907024014-53c02afd1b4c
|
||||
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230907045454-3d28e78db9bc
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20230907030149-8deb88b04e9a
|
||||
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230907030747-a7f8f6fb3f40
|
||||
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230907044854-f814d6e6e7b2
|
||||
k8s.io/kms => k8s.io/kms v0.0.0-20230907031232-abbc44379a34
|
||||
)
|
||||
|
|
|
|||
23
go.sum
23
go.sum
|
|
@ -8,6 +8,7 @@ github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV
|
|||
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
|
||||
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
|
||||
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
|
|
@ -73,21 +74,21 @@ 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-20230901043045-d68a18351c00 h1:plDl2FaMrSOtZgQQfiE4PwlUH1sTuQ92EY7aMnxRciI=
|
||||
k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013 h1:SWrddEv3aWWseUfiT42ziJUc8Gck/2Iqltz0Z+ctTB8=
|
||||
k8s.io/apimachinery v0.0.0-20230901041540-0d057e543013/go.mod h1:4XSLsQ98qjSQA9IF1M+KnXoc+E7kiualOL0cx3GFYZI=
|
||||
k8s.io/cloud-provider v0.0.0-20230901081224-4b81b289a1c4 h1:Z1TZNZtDVFDVXqw/8SaW5g+f3QusiNHcIo5Y2nG0+3k=
|
||||
k8s.io/cloud-provider v0.0.0-20230901081224-4b81b289a1c4/go.mod h1:HFM2/9iI9Wgtq2rtxukrH2/5BOayjmqvQZgQvMx2K+I=
|
||||
k8s.io/component-base v0.0.0-20230901051635-6a97c85314ee h1:Anwc25j0e3xg4JVrZ5eYm38LYFPWENftQc17unJmRn8=
|
||||
k8s.io/component-base v0.0.0-20230901051635-6a97c85314ee/go.mod h1:yBM3yqVHGaf3rugDRYf5C5JHw/gT2E3MCfyCEErkVVQ=
|
||||
k8s.io/controller-manager v0.0.0-20230901080318-c917325a83f5 h1:xvGdnqzcJl/y7jdr1Uy4XisAByYnTiAG6bvY39euUa0=
|
||||
k8s.io/controller-manager v0.0.0-20230901080318-c917325a83f5/go.mod h1:9gjkdA8MDC2n1nm1n7vK/DXiDZX1dla22MxskQNRZRw=
|
||||
k8s.io/api v0.0.0-20230907022840-7f63b7b88cb6 h1:W8rAlNcUN4dlFStbEcb4bBL6q3fiGpaASwBIrB8z0j0=
|
||||
k8s.io/apimachinery v0.0.0-20230907021858-82362bc34ae0 h1:tzU1AperxkpvBJuXbU9F1az4/HfUXiMUIYBYeBfAml0=
|
||||
k8s.io/apimachinery v0.0.0-20230907021858-82362bc34ae0/go.mod h1:IBT3vBDYP6iFVwc5TyswcA1EzJ75ia8ZvP1xinRgUNo=
|
||||
k8s.io/cloud-provider v0.0.0-20230907045454-3d28e78db9bc h1:5ZdtqTde/ET1eVMsB+9mqbxoJRGWM63mkScHErl2oyY=
|
||||
k8s.io/cloud-provider v0.0.0-20230907045454-3d28e78db9bc/go.mod h1:eBWOzPa/v4F+q+9uE54xE97g8zfaebMgOPVVyDtP5iY=
|
||||
k8s.io/component-base v0.0.0-20230907030149-8deb88b04e9a h1:17qlUeLlk9BUAIecfnVW1MBuvg20YmSLg/g6HyfwMXo=
|
||||
k8s.io/component-base v0.0.0-20230907030149-8deb88b04e9a/go.mod h1:nLVC72NWbGXdPnUY9w9DxQ6VScjzZHEPgqhdAh7+uUY=
|
||||
k8s.io/controller-manager v0.0.0-20230907044854-f814d6e6e7b2 h1:oRZYMyWSziWmlnW1Nu1ByKxqXtkAd1Zz/S1tVAPsWvM=
|
||||
k8s.io/controller-manager v0.0.0-20230907044854-f814d6e6e7b2/go.mod h1:9GpBYhKkf/2CmEas/JLxnSrLZAlkPYNYQ1RMfzUyopU=
|
||||
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=
|
||||
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=
|
||||
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
|
||||
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
|
||||
sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
|
||||
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
|
||||
|
|
|
|||
Loading…
Reference in New Issue