Merge pull request #105632 from xens/fix/kubectl-socks5-proxy2

Add SOCKS5 proxy support for kubectl exec

Kubernetes-commit: d10161b45b751df45701e343599476e27d533d58
This commit is contained in:
Kubernetes Publisher 2022-01-21 15:01:06 -08:00
parent 83a9db6e07
commit ef5e80feed
2 changed files with 24 additions and 13 deletions

23
go.mod
View File

@ -5,19 +5,18 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20220122011717-3d7c63b4de4f
k8s.io/cloud-provider v0.0.0-20220122014755-fa80685cd50c
k8s.io/controller-manager v0.0.0-20220122014644-8ac0750ca80f
)
replace (
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/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20220122011914-e6d62ddcb184
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220122011717-3d7c63b4de4f
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220122013124-526d2d33b79d
k8s.io/client-go => k8s.io/client-go v0.0.0-20220122012155-3255cdcd9cf0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220122014755-fa80685cd50c
k8s.io/component-base => k8s.io/component-base v0.0.0-20220122012704-f57281d7c18f
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220122012806-c839e8046fed
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20220122014644-8ac0750ca80f
)

14
go.sum
View File

@ -63,7 +63,6 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@ -859,6 +858,19 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220122011914-e6d62ddcb184 h1:a1wkQXZrIEgcgVgsnIgfLTZKfJaCHnOaAcg++AK2VdU=
k8s.io/api v0.0.0-20220122011914-e6d62ddcb184/go.mod h1:9BHCEbOkylgh9XPJAareQz6PA4lvlzao3FSiw9D9hIg=
k8s.io/apimachinery v0.0.0-20220122011717-3d7c63b4de4f h1:LDS86PISylkCZIAp15eBSScOVdrsPLclxgvezdAJCjo=
k8s.io/apimachinery v0.0.0-20220122011717-3d7c63b4de4f/go.mod h1:x0yrIIAdS2/JR9TKFHtSn8dYQDIw8mTIeAqPvOuEozA=
k8s.io/apiserver v0.0.0-20220122013124-526d2d33b79d/go.mod h1:7B7VmbYVh1bWZWzEDmhpLUqHmFZXb8yNB7oAaIq+Qlw=
k8s.io/client-go v0.0.0-20220122012155-3255cdcd9cf0/go.mod h1:LNxsq+SALfG518PchpbdMDqd4XMon0C1Wlnu0AJg8/w=
k8s.io/cloud-provider v0.0.0-20220122014755-fa80685cd50c h1:BCG92RnyeRJNXVG40WQYob8dtq09PxT4zvZeoOPWaLY=
k8s.io/cloud-provider v0.0.0-20220122014755-fa80685cd50c/go.mod h1:zT+4s3GElQftw+TDHhPfjChrmxLGLHgqQjtqFwIUn1w=
k8s.io/component-base v0.0.0-20220122012704-f57281d7c18f h1:w7E6jE+nZJ8H9L+kKxRu/MR1FPmwaG25AtoqHj2QG6w=
k8s.io/component-base v0.0.0-20220122012704-f57281d7c18f/go.mod h1:TsfwhY9IgBLBklEdFfg6Zr0N4KuU8A1Px63NVU/kDHg=
k8s.io/component-helpers v0.0.0-20220122012806-c839e8046fed/go.mod h1:d+au3zqOwmNwq0U7kEJkTLbQv+M2xAYKFCSTrlX4j2E=
k8s.io/controller-manager v0.0.0-20220122014644-8ac0750ca80f h1:E1j7eTblCB008DenlgTr/w/kCAzSpIV1DPwmbaky8vM=
k8s.io/controller-manager v0.0.0-20220122014644-8ac0750ca80f/go.mod h1:6BVkHqZ8Hq2/k1odwDFMo/hl4bpQNYVaKUC+Ctb+3Zg=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=