From 642da21ad24c817a96be82e0ad6fc4a399c80f0b Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 28 Jul 2021 08:11:10 -0400 Subject: [PATCH 1/2] Fix a unit test The "Validate that we don't allow the feature-gates to be set via user config" test was using a syntactically-invalid value of feature-gates, so it would have failed even if we did allow feature-gates to be set. --- pkg/network/openshift_sdn_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/network/openshift_sdn_test.go b/pkg/network/openshift_sdn_test.go index bcd5a47ddc..adc3ee7774 100644 --- a/pkg/network/openshift_sdn_test.go +++ b/pkg/network/openshift_sdn_test.go @@ -293,7 +293,7 @@ func TestProxyArgs(t *testing.T) { g.Expect(errs).To(HaveLen(0)) // Validate that we don't allow the feature-gates to be set via user config config.KubeProxyConfig.ProxyArguments = map[string]operv1.ProxyArgumentList{ - "feature-gates": {"FGBar=baz"}, + "feature-gates": {"FGBar=true"}, } errs = validateKubeProxy(config) g.Expect(errs).To(HaveLen(1)) From 4d69ca6107cbbc94f458da1a87b6e4ee4238c433 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 28 Jul 2021 08:12:40 -0400 Subject: [PATCH 2/2] Don't pass EndpointSliceProxying=false to openshift-sdn any more It supports it now --- pkg/network/openshift_sdn.go | 3 +-- pkg/network/openshift_sdn_test.go | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/network/openshift_sdn.go b/pkg/network/openshift_sdn.go index 0c8d171179..c338225fca 100644 --- a/pkg/network/openshift_sdn.go +++ b/pkg/network/openshift_sdn.go @@ -71,8 +71,7 @@ func renderOpenShiftSDN(conf *operv1.NetworkSpec, bootstrapResult *bootstrap.Boo // the insecure metrics port exposed by kube-proxy itself. So just override // the value from conf (which we know is either "9101" or unspecified). kpcOverrides := map[string]operv1.ProxyArgumentList{ - "metrics-port": {"29101"}, - "feature-gates": {"EndpointSliceProxying=false"}, + "metrics-port": {"29101"}, } if *c.EnableUnidling { // We already validated that proxy-mode was either unset or iptables. diff --git a/pkg/network/openshift_sdn_test.go b/pkg/network/openshift_sdn_test.go index adc3ee7774..bec1e2a069 100644 --- a/pkg/network/openshift_sdn_test.go +++ b/pkg/network/openshift_sdn_test.go @@ -446,8 +446,6 @@ conntrack: tcpEstablishedTimeout: null detectLocalMode: "" enableProfiling: true -featureGates: - EndpointSliceProxying: false healthzBindAddress: 0.0.0.0:10256 hostnameOverride: "" iptables: @@ -502,8 +500,6 @@ conntrack: tcpEstablishedTimeout: null detectLocalMode: "" enableProfiling: true -featureGates: - EndpointSliceProxying: false healthzBindAddress: 0.0.0.0:10256 hostnameOverride: "" iptables: