From 773efeedc34785c8f9f686fd58b34abb952eff79 Mon Sep 17 00:00:00 2001 From: Romain Aviolat Date: Mon, 17 Jan 2022 15:28:44 +0100 Subject: [PATCH] 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 Signed-off-by: Romain Jufer Kubernetes-commit: 0a98875e9572d998fbdf3bcdaef4961715b8bc06 --- go.mod | 17 +++++++++-------- go.sum | 9 +-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 082c2181..cef28616 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,17 @@ module k8s.io/sample-controller go 1.16 require ( - k8s.io/api v0.0.0-20220121011925-35d41aaac2bf - k8s.io/apimachinery v0.0.0-20220121011720-73cb56485259 - k8s.io/client-go v0.0.0-20220121012216-b70ee0aa9aa1 - k8s.io/code-generator v0.0.0-20220121011527-e4455d948cd9 + k8s.io/api v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/code-generator v0.0.0 k8s.io/klog/v2 v2.40.1 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220121011925-35d41aaac2bf - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220121011720-73cb56485259 - k8s.io/client-go => k8s.io/client-go v0.0.0-20220121012216-b70ee0aa9aa1 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220121011527-e4455d948cd9 + k8s.io/api => ../api + k8s.io/apimachinery => ../apimachinery + k8s.io/client-go => ../client-go + k8s.io/code-generator => ../code-generator + k8s.io/sample-controller => ../sample-controller ) diff --git a/go.sum b/go.sum index 3bd4e8f3..5bace184 100644 --- a/go.sum +++ b/go.sum @@ -50,6 +50,7 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -615,14 +616,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-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-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/client-go v0.0.0-20220121012216-b70ee0aa9aa1 h1:RcL9CpBVqahhM6EWwp4V1D59uM2mrseos2we/TlUNmY= -k8s.io/client-go v0.0.0-20220121012216-b70ee0aa9aa1/go.mod h1:SYEtwHGkq1L/OC6Dp/Q5KyrV+vgWFniN3cKFn8lk/sA= -k8s.io/code-generator v0.0.0-20220121011527-e4455d948cd9 h1:7lqusOmgUzZjV4Z78P0hLM5Iv1zyZO8s4geUWVBiT1U= -k8s.io/code-generator v0.0.0-20220121011527-e4455d948cd9/go.mod h1:RGBk0F4ZD2LgSn/a0UQWbmrfdaz0dYeEGJ1d8FZhkuU= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=