github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-16 23:29:21 +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

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

@ -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"},
@ -5723,7 +5719,6 @@ 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
@ -5732,7 +5727,6 @@ func TestTerminatingEndpointsTrafficPolicyLocal(t *testing.T) {
{ {
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"),
@ -5873,7 +5867,6 @@ 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"),
@ -6002,7 +5995,6 @@ 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"),
@ -6089,7 +6081,6 @@ 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"),
@ -6255,7 +6246,6 @@ 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
@ -6264,7 +6254,6 @@ func TestTerminatingEndpointsTrafficPolicyCluster(t *testing.T) {
{ {
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"),
@ -6396,7 +6385,6 @@ 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"),
@ -6521,7 +6509,6 @@ 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"),
@ -6605,7 +6592,6 @@ 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"),