mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-15 23:03:40 +00:00
Remove some stray references to the ProxyTerminatingEndpoints feature gate
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:
parent
4835d9e137
commit
1437594786
@ -5480,7 +5480,6 @@ func TestInternalTrafficPolicyE2E(t *testing.T) {
|
|||||||
name string
|
name string
|
||||||
line int
|
line int
|
||||||
internalTrafficPolicy *v1.ServiceInternalTrafficPolicy
|
internalTrafficPolicy *v1.ServiceInternalTrafficPolicy
|
||||||
featureGateOn bool
|
|
||||||
endpoints []endpoint
|
endpoints []endpoint
|
||||||
expectEndpointRule bool
|
expectEndpointRule bool
|
||||||
expectedIPTablesWithSlice string
|
expectedIPTablesWithSlice string
|
||||||
@ -5490,7 +5489,6 @@ func TestInternalTrafficPolicyE2E(t *testing.T) {
|
|||||||
name: "internalTrafficPolicy is cluster",
|
name: "internalTrafficPolicy is cluster",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
internalTrafficPolicy: &cluster,
|
internalTrafficPolicy: &cluster,
|
||||||
featureGateOn: true,
|
|
||||||
endpoints: []endpoint{
|
endpoints: []endpoint{
|
||||||
{"10.0.1.1", testHostname},
|
{"10.0.1.1", testHostname},
|
||||||
{"10.0.1.2", "host1"},
|
{"10.0.1.2", "host1"},
|
||||||
@ -5513,7 +5511,6 @@ func TestInternalTrafficPolicyE2E(t *testing.T) {
|
|||||||
name: "internalTrafficPolicy is local and there are local endpoints",
|
name: "internalTrafficPolicy is local and there are local endpoints",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
internalTrafficPolicy: &local,
|
internalTrafficPolicy: &local,
|
||||||
featureGateOn: true,
|
|
||||||
endpoints: []endpoint{
|
endpoints: []endpoint{
|
||||||
{"10.0.1.1", testHostname},
|
{"10.0.1.1", testHostname},
|
||||||
{"10.0.1.2", "host1"},
|
{"10.0.1.2", "host1"},
|
||||||
@ -5567,7 +5564,6 @@ func TestInternalTrafficPolicyE2E(t *testing.T) {
|
|||||||
name: "internalTrafficPolicy is local and there are no local endpoints",
|
name: "internalTrafficPolicy is local and there are no local endpoints",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
internalTrafficPolicy: &local,
|
internalTrafficPolicy: &local,
|
||||||
featureGateOn: true,
|
|
||||||
endpoints: []endpoint{
|
endpoints: []endpoint{
|
||||||
{"10.0.1.1", "host0"},
|
{"10.0.1.1", "host0"},
|
||||||
{"10.0.1.2", "host1"},
|
{"10.0.1.2", "host1"},
|
||||||
@ -5721,18 +5717,16 @@ func TestTerminatingEndpointsTrafficPolicyLocal(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
testcases := []struct {
|
testcases := []struct {
|
||||||
name string
|
name string
|
||||||
line int
|
line int
|
||||||
terminatingFeatureGate bool
|
endpointslice *discovery.EndpointSlice
|
||||||
endpointslice *discovery.EndpointSlice
|
expectedIPTables string
|
||||||
expectedIPTables string
|
noUsableEndpoints bool
|
||||||
noUsableEndpoints bool
|
flowTests []packetFlowTest
|
||||||
flowTests []packetFlowTest
|
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "ready endpoints exist",
|
name: "ready endpoints exist",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
terminatingFeatureGate: true,
|
|
||||||
endpointslice: &discovery.EndpointSlice{
|
endpointslice: &discovery.EndpointSlice{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: fmt.Sprintf("%s-1", "svc1"),
|
Name: fmt.Sprintf("%s-1", "svc1"),
|
||||||
@ -5871,9 +5865,8 @@ func TestTerminatingEndpointsTrafficPolicyLocal(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "only terminating endpoints exist",
|
name: "only terminating endpoints exist",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
terminatingFeatureGate: true,
|
|
||||||
endpointslice: &discovery.EndpointSlice{
|
endpointslice: &discovery.EndpointSlice{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: fmt.Sprintf("%s-1", "svc1"),
|
Name: fmt.Sprintf("%s-1", "svc1"),
|
||||||
@ -6000,9 +5993,8 @@ func TestTerminatingEndpointsTrafficPolicyLocal(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "terminating endpoints on remote node",
|
name: "terminating endpoints on remote node",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
terminatingFeatureGate: true,
|
|
||||||
endpointslice: &discovery.EndpointSlice{
|
endpointslice: &discovery.EndpointSlice{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: fmt.Sprintf("%s-1", "svc1"),
|
Name: fmt.Sprintf("%s-1", "svc1"),
|
||||||
@ -6087,9 +6079,8 @@ func TestTerminatingEndpointsTrafficPolicyLocal(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "no usable endpoints on any node",
|
name: "no usable endpoints on any node",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
terminatingFeatureGate: true,
|
|
||||||
endpointslice: &discovery.EndpointSlice{
|
endpointslice: &discovery.EndpointSlice{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: fmt.Sprintf("%s-1", "svc1"),
|
Name: fmt.Sprintf("%s-1", "svc1"),
|
||||||
@ -6253,18 +6244,16 @@ func TestTerminatingEndpointsTrafficPolicyCluster(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
testcases := []struct {
|
testcases := []struct {
|
||||||
name string
|
name string
|
||||||
line int
|
line int
|
||||||
terminatingFeatureGate bool
|
endpointslice *discovery.EndpointSlice
|
||||||
endpointslice *discovery.EndpointSlice
|
expectedIPTables string
|
||||||
expectedIPTables string
|
noUsableEndpoints bool
|
||||||
noUsableEndpoints bool
|
flowTests []packetFlowTest
|
||||||
flowTests []packetFlowTest
|
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
name: "ready endpoints exist",
|
name: "ready endpoints exist",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
terminatingFeatureGate: true,
|
|
||||||
endpointslice: &discovery.EndpointSlice{
|
endpointslice: &discovery.EndpointSlice{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: fmt.Sprintf("%s-1", "svc1"),
|
Name: fmt.Sprintf("%s-1", "svc1"),
|
||||||
@ -6394,9 +6383,8 @@ func TestTerminatingEndpointsTrafficPolicyCluster(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "only terminating endpoints exist",
|
name: "only terminating endpoints exist",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
terminatingFeatureGate: true,
|
|
||||||
endpointslice: &discovery.EndpointSlice{
|
endpointslice: &discovery.EndpointSlice{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: fmt.Sprintf("%s-1", "svc1"),
|
Name: fmt.Sprintf("%s-1", "svc1"),
|
||||||
@ -6519,9 +6507,8 @@ func TestTerminatingEndpointsTrafficPolicyCluster(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "terminating endpoints on remote node",
|
name: "terminating endpoints on remote node",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
terminatingFeatureGate: true,
|
|
||||||
endpointslice: &discovery.EndpointSlice{
|
endpointslice: &discovery.EndpointSlice{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: fmt.Sprintf("%s-1", "svc1"),
|
Name: fmt.Sprintf("%s-1", "svc1"),
|
||||||
@ -6603,9 +6590,8 @@ func TestTerminatingEndpointsTrafficPolicyCluster(t *testing.T) {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "no usable endpoints on any node",
|
name: "no usable endpoints on any node",
|
||||||
line: getLine(),
|
line: getLine(),
|
||||||
terminatingFeatureGate: true,
|
|
||||||
endpointslice: &discovery.EndpointSlice{
|
endpointslice: &discovery.EndpointSlice{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: fmt.Sprintf("%s-1", "svc1"),
|
Name: fmt.Sprintf("%s-1", "svc1"),
|
||||||
|
Loading…
Reference in New Issue
Block a user