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

feat: add missing SOCKS5 features 

Goal of this commit is to add some missing features when the
Kubernetes API is accessed through a SOCKS5 proxy. That's for
example the case when port-forwarding is used (`kubectl port-forward`)
or when exec'ing inside a container (`kubectl exec`), with this
commit it'll now be possible to use both.

Signed-off-by: Romain Aviolat <romain.aviolat@kudelskisecurity.com>
Signed-off-by: Romain Jufer <romain.jufer@kudelskisecurity.com>

Kubernetes-commit: 0a98875e9572d998fbdf3bcdaef4961715b8bc06
This commit is contained in:
Romain Aviolat 2022-01-17 15:28:44 +01:00 committed by Kubernetes Publisher
parent cd6d59d2e1
commit 83a9db6e07
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
go.mod
View File

@ -5,18 +5,19 @@ module k8s.io/kube-controller-manager
go 1.16 go 1.16
require ( require (
k8s.io/apimachinery v0.0.0-20220121011720-73cb56485259 k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0-20220121014948-185418e95ae8 k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0-20220121014836-909da738ebc7 k8s.io/controller-manager v0.0.0
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220121011925-35d41aaac2bf k8s.io/api => ../api
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220121011720-73cb56485259 k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220121013207-7b57af05833d k8s.io/apiserver => ../apiserver
k8s.io/client-go => k8s.io/client-go v0.0.0-20220121012216-b70ee0aa9aa1 k8s.io/client-go => ../client-go
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20220121014948-185418e95ae8 k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => k8s.io/component-base v0.0.0-20220121012730-519780c968a8 k8s.io/component-base => ../component-base
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220121012834-3aa0f60e9aa0 k8s.io/component-helpers => ../component-helpers
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20220121014836-909da738ebc7 k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

15
go.sum
View File

@ -61,6 +61,8 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= 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/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.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
@ -857,19 +859,6 @@ 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-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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/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-20220121011925-35d41aaac2bf h1:YfvP4cnW6dKo6VJI9j770wf9HFNstlL1lTZSv8Po3P0=
k8s.io/api v0.0.0-20220121011925-35d41aaac2bf/go.mod h1:6NbRkVCqMWJ9t2zDss/u/CQNhbj5JfBsIGC6hW1VsgM=
k8s.io/apimachinery v0.0.0-20220121011720-73cb56485259 h1:Ju5fq+ZSlfEETrJWX8Wa0QMAqvUmkQ1QFgivCxdowmo=
k8s.io/apimachinery v0.0.0-20220121011720-73cb56485259/go.mod h1:y1fv8sTaVIr58F1alwS9QI0fqvgejZBb/1QmzsmqptU=
k8s.io/apiserver v0.0.0-20220121013207-7b57af05833d/go.mod h1:zJ9nWdk5Aa1WLNDzPDpAHrHMTPkcYip5csLuv4Kl+zU=
k8s.io/client-go v0.0.0-20220121012216-b70ee0aa9aa1/go.mod h1:SYEtwHGkq1L/OC6Dp/Q5KyrV+vgWFniN3cKFn8lk/sA=
k8s.io/cloud-provider v0.0.0-20220121014948-185418e95ae8 h1:xhoWbtcuqUMIguVusEicbC03pKypB/kZ5ZUQJndt96g=
k8s.io/cloud-provider v0.0.0-20220121014948-185418e95ae8/go.mod h1:UHVM5JkfPrSI7yEPxwtSruUFCCzb8QV1043MQ2kMkIs=
k8s.io/component-base v0.0.0-20220121012730-519780c968a8 h1:B4ug5LozurehlF8QTLTUvfxYMT7SEl9XHJT79bYg4Cs=
k8s.io/component-base v0.0.0-20220121012730-519780c968a8/go.mod h1:zCpcdr+xVM5Xyqve0vBPrgRSqRXAOezBH0702Dpw2f4=
k8s.io/component-helpers v0.0.0-20220121012834-3aa0f60e9aa0/go.mod h1:3l28b7qOTXUNLBko4AytmyaZyGB7FcZSKhEP0FU24iA=
k8s.io/controller-manager v0.0.0-20220121014836-909da738ebc7 h1:3+Otv6RX8ucFUz39LCXFZjEXOuF/xqt5Dnr2UgNJGmg=
k8s.io/controller-manager v0.0.0-20220121014836-909da738ebc7/go.mod h1:qim0cs5PA2fzzdGBb1nex27JIFqHlwmzmwpVc8HTOJw=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= 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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=