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 #115840 from atosatto/remove-taint-manager-cli 

Remove enable-taint-manager and pod-eviction-timeout CLI flags

Kubernetes-commit: a0b1bee7c5214af37f04b555ee59a7c81ec0699b
This commit is contained in:
Kubernetes Publisher 2023-03-13 08:13:10 -07:00
parent 1b485fe887
commit 53ad9f5d0a
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/kube-controller-manager
go 1.19
require (
k8s.io/apimachinery v0.0.0-20230303235433-5b1cff80ea06
k8s.io/cloud-provider v0.0.0-20230304010438-895eed3d0ac6
k8s.io/controller-manager v0.0.0-20230304010310-387576b93bbd
k8s.io/apimachinery v0.0.0-20230310204503-273f86d1012f
k8s.io/cloud-provider v0.0.0-20230310180016-fa271f103b48
k8s.io/controller-manager v0.0.0-20230310175645-2459e9145333
)
require (
@ -15,16 +15,15 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
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.9.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/text v0.7.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-20230304000858-ddedd087ad1e // indirect
k8s.io/api v0.0.0-20230313011535-19ee583d5657 // indirect
k8s.io/component-base v0.0.0-20230310085212-d69652187fff // 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 +31,13 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20230303235756-fc1b77c3f4ab
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230303235433-5b1cff80ea06
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230304002344-4d04ac1ed050
k8s.io/client-go => k8s.io/client-go v0.0.0-20230304000202-d39f8291fc57
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230304010438-895eed3d0ac6
k8s.io/component-base => k8s.io/component-base v0.0.0-20230304000858-ddedd087ad1e
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230304001010-94a6fd9a7905
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230304010310-387576b93bbd
k8s.io/kms => k8s.io/kms v0.0.0-20230303123242-0b3f9dde5fcd
k8s.io/api => k8s.io/api v0.0.0-20230313011535-19ee583d5657
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230310204503-273f86d1012f
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20230311020145-7a11b7b1b3b6
k8s.io/client-go => k8s.io/client-go v0.0.0-20230313012152-012954e4d5d6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20230310180016-fa271f103b48
k8s.io/component-base => k8s.io/component-base v0.0.0-20230310085212-d69652187fff
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230310085329-cb3213391b8c
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20230310175645-2459e9145333
k8s.io/kms => k8s.io/kms v0.0.0-20230304001132-5439f76ca4a7
)

22
go.sum
View File

@ -1,4 +1,3 @@
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=
@ -20,7 +19,6 @@ github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
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=
@ -29,7 +27,6 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
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.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
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=
@ -74,15 +71,16 @@ 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-20230303235756-fc1b77c3f4ab h1:peGI8OxM+LOJxG8FqX/y6BVELxehZ4fDq9cm1a5Qaz0=
k8s.io/apimachinery v0.0.0-20230303235433-5b1cff80ea06 h1:d8NkMUaqPq1ghtNIScF2RIPgGhSu+scUUrxsinWDThg=
k8s.io/apimachinery v0.0.0-20230303235433-5b1cff80ea06/go.mod h1:jlJwObMa4oKAEOMnAeEaqeiM+Fwd/CbAwNyQ7OaEwS0=
k8s.io/cloud-provider v0.0.0-20230304010438-895eed3d0ac6 h1:x0ST55hNocIbpsgZajuE7gn0wf1KbDXIuI1RR5JphXs=
k8s.io/cloud-provider v0.0.0-20230304010438-895eed3d0ac6/go.mod h1:jbNi+fGu67p2jaZxype8LHH/HpoS7mlXmUxNqjaSfec=
k8s.io/component-base v0.0.0-20230304000858-ddedd087ad1e h1:PuygjVw/jQzOBSJ1s6xv1oA7Dc5ZvEDxfpS/5k8ZMHQ=
k8s.io/component-base v0.0.0-20230304000858-ddedd087ad1e/go.mod h1:vldhe13R/1pbgyrY1SwSHHwol4MWZNyU0J5mCvBECfA=
k8s.io/controller-manager v0.0.0-20230304010310-387576b93bbd h1:6KgbfgeWciHI5h0TFx9E41ZXcO2v3VGenhFNn5kwi2g=
k8s.io/controller-manager v0.0.0-20230304010310-387576b93bbd/go.mod h1:lUvHmmqo6DrNrTPLaRxWqIqiy6CqGfmE6cPv2Oj0EAw=
k8s.io/api v0.0.0-20230313011535-19ee583d5657 h1:7hP13dy95USecJLpO3d/yllQXI+SNLRRGM7PwTgymWI=
k8s.io/api v0.0.0-20230313011535-19ee583d5657/go.mod h1:mC4uNxaqlroZsbbPGKGEBST4KfC7f1enRIJHulFvlU0=
k8s.io/apimachinery v0.0.0-20230310204503-273f86d1012f h1:SMeRbv27Q4QvyAGw6IkqXzluMMJnL3gtBpk1W3fCao0=
k8s.io/apimachinery v0.0.0-20230310204503-273f86d1012f/go.mod h1:RWA+8iKvi6iwtPZ0MMwtZSlZRiH+SnmQH2SbXJrVDPQ=
k8s.io/cloud-provider v0.0.0-20230310180016-fa271f103b48 h1:h1uYPcq/uhN3lxZ2hxKDLooAFQbxrbqC521n0WKb8w4=
k8s.io/cloud-provider v0.0.0-20230310180016-fa271f103b48/go.mod h1:/CTUXCwqcnQDNt9j6OmyP+jfabuHGBH07ES/X6fxS3o=
k8s.io/component-base v0.0.0-20230310085212-d69652187fff h1:xIjiK+aBPzY5Mqh/lFvmlfgvS1O35/hyhPw/LTmYyNA=
k8s.io/component-base v0.0.0-20230310085212-d69652187fff/go.mod h1:Z2LoX89dLUu0xNvMSY057kEMNJjD/XD53nEyD0Lji2s=
k8s.io/controller-manager v0.0.0-20230310175645-2459e9145333 h1:tWaSE4KoHzgYj7rHs8R/91uFnE/shERVZgM9pm20M2w=
k8s.io/controller-manager v0.0.0-20230310175645-2459e9145333/go.mod h1:qKv4wG8nNLEXxTFXFida28jMOjq9fPgVSIJApmp6s3Q=
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=