diff --git a/go.mod b/go.mod index 449f6bb64..8cb97a7b9 100644 --- a/go.mod +++ b/go.mod @@ -44,9 +44,9 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 k8s.io/api v0.0.0-20220226220324-b8c40e080bc5 - k8s.io/apimachinery v0.0.0-20220226220127-2936d3f03931 - k8s.io/client-go v0.0.0-20220223220919-cc43a708a08e - k8s.io/component-base v0.0.0-20220224180730-a553b65c5b50 + k8s.io/apimachinery v0.0.0-20220305020656-da0995ba93c3 + k8s.io/client-go v0.0.0-20220303122547-eb103e0abf62 + k8s.io/component-base v0.0.0-20220301021127-30d23418100a k8s.io/klog/v2 v2.40.1 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 @@ -58,7 +58,7 @@ require ( replace ( k8s.io/api => k8s.io/api v0.0.0-20220226220324-b8c40e080bc5 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220226220127-2936d3f03931 - k8s.io/client-go => k8s.io/client-go v0.0.0-20220223220919-cc43a708a08e - k8s.io/component-base => k8s.io/component-base v0.0.0-20220224180730-a553b65c5b50 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220305020656-da0995ba93c3 + k8s.io/client-go => k8s.io/client-go v0.0.0-20220303122547-eb103e0abf62 + k8s.io/component-base => k8s.io/component-base v0.0.0-20220301021127-30d23418100a ) diff --git a/go.sum b/go.sum index 93d866216..ec869811f 100644 --- a/go.sum +++ b/go.sum @@ -962,12 +962,12 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20220226220324-b8c40e080bc5 h1:z4oqfOInb6p7EwsJbKUe2IcKaeSBWmfYEIsIdFHq6ak= k8s.io/api v0.0.0-20220226220324-b8c40e080bc5/go.mod h1:xmVR3mDgBB2FAJoueQFwuWn03L5odGCiOKivsptcgRU= -k8s.io/apimachinery v0.0.0-20220226220127-2936d3f03931 h1:pb7vtSnIF7dReuA6s+WsakFL6vLZ4xA71kJMln9j4Pc= -k8s.io/apimachinery v0.0.0-20220226220127-2936d3f03931/go.mod h1:6HjHJr7AD3yHuu+gOdE3O1dqE21lBVCDBk5W7wry/WI= -k8s.io/client-go v0.0.0-20220223220919-cc43a708a08e h1:r/P2uF57kN077M3gF+80GocaHebezzYeJTJnDn7/iYU= -k8s.io/client-go v0.0.0-20220223220919-cc43a708a08e/go.mod h1:YuHUFJ4rAxrbRqkrAaeTJSjAwhEQ9TACMkMOuybDnJA= -k8s.io/component-base v0.0.0-20220224180730-a553b65c5b50 h1:wn//u47z2jz+aTLTnze34akx+X9vJUoEISqgefRYdRg= -k8s.io/component-base v0.0.0-20220224180730-a553b65c5b50/go.mod h1:a+90xMwo7527AND+5CRdc0pkkwUbrMIPMCQEs4SJU7g= +k8s.io/apimachinery v0.0.0-20220305020656-da0995ba93c3 h1:JEGi8vCoh23TJCSXA4pExj5REB7X4bn2SbWsEuI8abY= +k8s.io/apimachinery v0.0.0-20220305020656-da0995ba93c3/go.mod h1:6HjHJr7AD3yHuu+gOdE3O1dqE21lBVCDBk5W7wry/WI= +k8s.io/client-go v0.0.0-20220303122547-eb103e0abf62 h1:kpsNQiWWMoxhrGbeNBVlojVEIkOUUXs+prjf7026YDE= +k8s.io/client-go v0.0.0-20220303122547-eb103e0abf62/go.mod h1:X+9ONiZCJ4K5521TlOgbcMrYFvkjacBd90IPckfzTac= +k8s.io/component-base v0.0.0-20220301021127-30d23418100a h1:ZEEAhoBrshp9Dskp4Cu01GWusuSj7rxqT9gpGHPT87M= +k8s.io/component-base v0.0.0-20220301021127-30d23418100a/go.mod h1:GxjPIEe+u2ujTZ5FAWeI72IXLuFY8otpmXIeWIP0G7M= 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= diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index acc369990..fc3d476b7 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -30,26 +30,6 @@ const ( // // alpha: v1.4 // MyFeature() bool - // owner: @tallclair - // alpha: v1.5 - // beta: v1.6 - // deprecated: v1.18 - // - // StreamingProxyRedirects controls whether the apiserver should intercept (and follow) - // redirects from the backend (Kubelet) for streaming requests (exec/attach/port-forward). - // - // This feature is deprecated, and will be removed in v1.24. - StreamingProxyRedirects featuregate.Feature = "StreamingProxyRedirects" - - // owner: @tallclair - // alpha: v1.12 - // beta: v1.14 - // deprecated: v1.22 - // - // ValidateProxyRedirects controls whether the apiserver should validate that redirects are only - // followed to the same host. Only used if StreamingProxyRedirects is enabled. - ValidateProxyRedirects featuregate.Feature = "ValidateProxyRedirects" - // owner: @tallclair // alpha: v1.7 // beta: v1.8 @@ -213,8 +193,6 @@ func init() { // To add a new feature, define a key for it above and add it here. The features will be // available throughout Kubernetes binaries. var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ - StreamingProxyRedirects: {Default: false, PreRelease: featuregate.Deprecated}, - ValidateProxyRedirects: {Default: true, PreRelease: featuregate.Deprecated}, AdvancedAuditing: {Default: true, PreRelease: featuregate.GA}, APIResponseCompression: {Default: true, PreRelease: featuregate.Beta}, APIListChunking: {Default: true, PreRelease: featuregate.Beta},