github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-14 06:15:45 +00:00
Code Issues Projects Releases Wiki Activity

Remove some stray references to the ProxyTerminatingEndpoints feature gate

Browse Source 
All the code to deal with enabling/disabling the feature gate is gone,
but some of the tests were still specifying "this test case assumes
PTE is enabled".
This commit is contained in:
Dan Winship 2023-07-13 09:07:18 -04:00
parent 4835d9e137
commit 1437594786
1 changed files with 28 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
pkg/proxy/iptables/proxier_test.go
View File

@ -5480,7 +5480,6 @@ func TestInternalTrafficPolicyE2E(t *testing.T) {
name string
line int
internalTrafficPolicy *v1.ServiceInternalTrafficPolicy
featureGateOn bool
endpoints []endpoint
expectEndpointRule bool
expectedIPTablesWithSlice string
@ -5490,7 +5489,6 @@ func TestInternalTrafficPolicyE2E(t *testing.T) {
name: "internalTrafficPolicy is cluster",
line: getLine(),
internalTrafficPolicy: &cluster,
featureGateOn: true,
endpoints: []endpoint{
{"10.0.1.1", testHostname},
{"10.0.1.2", "host1"},
@ -5513,7 +5511,6 @@ func TestInternalTrafficPolicyE2E(t *testing.T) {
name: "internalTrafficPolicy is local and there are local endpoints",
line: getLine(),
internalTrafficPolicy: &local,
featureGateOn: true,
endpoints: []endpoint{
{"10.0.1.1", testHostname},
{"10.0.1.2", "host1"},
@ -5567,7 +5564,6 @@ func TestInternalTrafficPolicyE2E(t *testing.T) {
name: "internalTrafficPolicy is local and there are no local endpoints",
line: getLine(),
internalTrafficPolicy: &local,
featureGateOn: true,
endpoints: []endpoint{
{"10.0.1.1", "host0"},
{"10.0.1.2", "host1"},
@ -5721,18 +5717,16 @@ func TestTerminatingEndpointsTrafficPolicyLocal(t *testing.T) {
}
testcases := []struct {
name string
line int
terminatingFeatureGate bool
endpointslice *discovery.EndpointSlice
expectedIPTables string
noUsableEndpoints bool
flowTests []packetFlowTest
name string
line int
endpointslice *discovery.EndpointSlice
expectedIPTables string
noUsableEndpoints bool
flowTests []packetFlowTest
}{
{
name: "ready endpoints exist",
line: getLine(),
terminatingFeatureGate: true,
name: "ready endpoints exist",
line: getLine(),
endpointslice: &discovery.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-1", "svc1"),
@ -5871,9 +5865,8 @@ func TestTerminatingEndpointsTrafficPolicyLocal(t *testing.T) {
},
},
{
name: "only terminating endpoints exist",
line: getLine(),
terminatingFeatureGate: true,
name: "only terminating endpoints exist",
line: getLine(),
endpointslice: &discovery.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-1", "svc1"),
@ -6000,9 +5993,8 @@ func TestTerminatingEndpointsTrafficPolicyLocal(t *testing.T) {
},
},
{
name: "terminating endpoints on remote node",
line: getLine(),
terminatingFeatureGate: true,
name: "terminating endpoints on remote node",
line: getLine(),
endpointslice: &discovery.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-1", "svc1"),
@ -6087,9 +6079,8 @@ func TestTerminatingEndpointsTrafficPolicyLocal(t *testing.T) {
},
},
{
name: "no usable endpoints on any node",
line: getLine(),
terminatingFeatureGate: true,
name: "no usable endpoints on any node",
line: getLine(),
endpointslice: &discovery.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-1", "svc1"),
@ -6253,18 +6244,16 @@ func TestTerminatingEndpointsTrafficPolicyCluster(t *testing.T) {
}
testcases := []struct {
name string
line int
terminatingFeatureGate bool
endpointslice *discovery.EndpointSlice
expectedIPTables string
noUsableEndpoints bool
flowTests []packetFlowTest
name string
line int
endpointslice *discovery.EndpointSlice
expectedIPTables string
noUsableEndpoints bool
flowTests []packetFlowTest
}{
{
name: "ready endpoints exist",
line: getLine(),
terminatingFeatureGate: true,
name: "ready endpoints exist",
line: getLine(),
endpointslice: &discovery.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-1", "svc1"),
@ -6394,9 +6383,8 @@ func TestTerminatingEndpointsTrafficPolicyCluster(t *testing.T) {
},
},
{
name: "only terminating endpoints exist",
line: getLine(),
terminatingFeatureGate: true,
name: "only terminating endpoints exist",
line: getLine(),
endpointslice: &discovery.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-1", "svc1"),
@ -6519,9 +6507,8 @@ func TestTerminatingEndpointsTrafficPolicyCluster(t *testing.T) {
},
},
{
name: "terminating endpoints on remote node",
line: getLine(),
terminatingFeatureGate: true,
name: "terminating endpoints on remote node",
line: getLine(),
endpointslice: &discovery.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-1", "svc1"),
@ -6603,9 +6590,8 @@ func TestTerminatingEndpointsTrafficPolicyCluster(t *testing.T) {
},
},
{
name: "no usable endpoints on any node",
line: getLine(),
terminatingFeatureGate: true,
name: "no usable endpoints on any node",
line: getLine(),
endpointslice: &discovery.EndpointSlice{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-1", "svc1"),