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 #111915 from aojea/crd_recursion_bug_1_24 

cherry pick pr #111557 to 1.24 :update smd to 4.2.3

Kubernetes-commit: aeb26cde7aabff15c97db985cdd1748d76a966a3
This commit is contained in:
Kubernetes Publisher 2023-01-11 19:16:53 -08:00
parent 9f76f7ce2b 8d13b4dfa3
commit 020f2d9d73
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager
go 1.19
require (
k8s.io/apimachinery v0.0.0-20221223020506-cbd9e8b8f027
k8s.io/cloud-provider v0.0.0-20221223065815-2de005404c95
k8s.io/controller-manager v0.0.0-20221223065209-d49b55c39bf2
k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776
k8s.io/cloud-provider v0.0.0-20230112085928-416db700c4c0
k8s.io/controller-manager v0.0.0-20230112085634-11fbfcc5455e
)
require (
@ -22,20 +22,20 @@ require (
golang.org/x/text v0.5.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.0.0-20221223033407-6b456deee75a // indirect
k8s.io/component-base v0.0.0-20230112070501-6cc853a1632f // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20221223023026-8ab18bcbebb1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221223020506-cbd9e8b8f027
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20221223041923-9b7adcd8bc18
k8s.io/client-go => k8s.io/client-go v0.0.0-20221223031609-fa144945a15f
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20221223065815-2de005404c95
k8s.io/component-base => k8s.io/component-base v0.0.0-20221223033407-6b456deee75a
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221223034630-6c8accf5182e
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20221223065209-d49b55c39bf2
k8s.io/api => k8s.io/api v0.0.0-20230112063057-8b5496b74fa0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230112072953-9333fb751db5
k8s.io/client-go => k8s.io/client-go v0.0.0-20230112065157-816bb19ea7bb
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230112085928-416db700c4c0
k8s.io/component-base => k8s.io/component-base v0.0.0-20230112070501-6cc853a1632f
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230112070806-d1b24cfbb7ad
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230112085634-11fbfcc5455e
)

24
go.sum
View File

@ -10,7 +10,6 @@ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@ -19,7 +18,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
@ -71,15 +69,15 @@ 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-20221223023026-8ab18bcbebb1 h1:rB1L+670jti259NeEukySW9MZuwss6i1b3rK1HozfMU=
k8s.io/apimachinery v0.0.0-20221223020506-cbd9e8b8f027 h1:Bc+HJD1swYIVc9GZokUpgLyRbAI+ZvDBgd3AoYe0LYU=
k8s.io/apimachinery v0.0.0-20221223020506-cbd9e8b8f027/go.mod h1:Gqx4z+eZpKhlP6RIfnQahu4vwmi5Hg7B/mVAGbkSW/E=
k8s.io/cloud-provider v0.0.0-20221223065815-2de005404c95 h1:4QdQar+LPOQuchx9YeBWUIdopReFY4lKvrTjQHpHEFA=
k8s.io/cloud-provider v0.0.0-20221223065815-2de005404c95/go.mod h1:5bLmDDvH9TjUvPLXqLwvZDUFnNWUjlwS0aMZ6f0Nlwg=
k8s.io/component-base v0.0.0-20221223033407-6b456deee75a h1:1xNbne3xojeblnRyxVAc6PRkNeHY0AF2WwWtl08beZw=
k8s.io/component-base v0.0.0-20221223033407-6b456deee75a/go.mod h1:MvQJV808Jpwo2Ezk/+wPkMKMI8jtHIebBcKRWjuvaDo=
k8s.io/controller-manager v0.0.0-20221223065209-d49b55c39bf2 h1:AiKNpb8kSWJOdyGcHSDiGRgESCv1uAiQKowTjrD610g=
k8s.io/controller-manager v0.0.0-20221223065209-d49b55c39bf2/go.mod h1:viZp1jSsRcMhqQfHp+lPQ6mghjIHhXTaqI1gcaW7YrM=
k8s.io/api v0.0.0-20230112063057-8b5496b74fa0 h1:djmyHPrrVNQsNsHlbzxfCTgEpfqXWROKJlzZ5U3DQwc=
k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776 h1:erPF3QOKMPIikM39TzJlyVJYVpGdko6iRO9wDZ0RAWc=
k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776/go.mod h1:WKP/nbpA6xR1TodchJym9COpVcn+V3cAaaNmXk6bwzA=
k8s.io/cloud-provider v0.0.0-20230112085928-416db700c4c0 h1:0MWC4vgfXzOcGfPjWjzy0iaBPLR1yAb7nQS6KwVz1IM=
k8s.io/cloud-provider v0.0.0-20230112085928-416db700c4c0/go.mod h1:j76CEOsgBxjCr4MQBJ2he8L5IFKoLTbPc+0m5kyrOMk=
k8s.io/component-base v0.0.0-20230112070501-6cc853a1632f h1:hCIuOhe3q0joqmDhnKYfujUNhXstH1iQDyvwyxPAnxA=
k8s.io/component-base v0.0.0-20230112070501-6cc853a1632f/go.mod h1:YAVHovIjzzlN0M4bYNTGAnHziDKl/Ju7N/qh7HP2FL4=
k8s.io/controller-manager v0.0.0-20230112085634-11fbfcc5455e h1:aAV+rsBCXA6tuIoR6M2LtTVClrKTvlYjfm/Y3EweXDM=
k8s.io/controller-manager v0.0.0-20230112085634-11fbfcc5455e/go.mod h1:lqAUbYUAMGoq2iem2jSxfux9HqyJDcp+fowCXWI2BZU=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc=
k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
@ -87,6 +85,6 @@ k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19V
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y=
sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
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/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=