Skip to content

Bug 1989122: let openshift-sdn use EndpointSliceProxying #1166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-ci merged 2 commits into from
Aug 3, 2021
Merged

Bug 1989122: let openshift-sdn use EndpointSliceProxying #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
642da21
Fix a unit test
danwinship Jul 28, 2021
4d69ca6
Don't pass EndpointSliceProxying=false to openshift-sdn any more
danwinship Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkg/network/openshift_sdn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 1 addition & 5 deletions pkg/network/openshift_sdn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -446,8 +446,6 @@ conntrack:
tcpEstablishedTimeout: null
detectLocalMode: ""
enableProfiling: true
featureGates:
EndpointSliceProxying: false
healthzBindAddress: 0.0.0.0:10256
hostnameOverride: ""
iptables:
Expand Down Expand Up @@ -502,8 +500,6 @@ conntrack:
tcpEstablishedTimeout: null
detectLocalMode: ""
enableProfiling: true
featureGates:
EndpointSliceProxying: false
healthzBindAddress: 0.0.0.0:10256
hostnameOverride: ""
iptables:
Expand Down