Skip to content

Commit b3615dc

Browse files
authored
Merge pull request #2685 from shouri007/master
Allow externalTrafficPolicy: Cluster on multinetworking services
2 parents f9d236b + 9306960 commit b3615dc

File tree

2 files changed

+0
-34
lines changed

2 files changed

+0
-34
lines changed

pkg/network/network.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,6 @@ func (nr *NetworksResolver) ServiceNetwork(service *apiv1.Service) (*NetworkInfo
128128
return DefaultNetwork(nr.cloudProvider), nil
129129
}
130130

131-
// TODO: remove this check once DPv2 supports externalTrafficPolicy=Cluster services.
132-
if service.Spec.ExternalTrafficPolicy != apiv1.ServiceExternalTrafficPolicyLocal {
133-
return nil, utils.NewUserError(fmt.Errorf("multinetwork services with externalTrafficPolicy='%s' are not supported, only externalTrafficPolicy=Local services are supported", service.Spec.ExternalTrafficPolicy))
134-
}
135-
136131
obj, exists, err := nr.networkLister.GetByKey(networkName)
137132
if err != nil {
138133
return nil, err

pkg/network/network_test.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -195,35 +195,6 @@ func TestServiceNetwork(t *testing.T) {
195195
service: serviceWithSecondaryNet,
196196
wantErr: "network.Spec.Type=Device is not supported for multinetwork LoadBalancer services, the only supported network type is L3",
197197
},
198-
{
199-
desc: "service with externalTrafficPolicy=Cluster",
200-
network: testNetwork("secondary-network", "secondary-network-params"),
201-
gkeNetworkParamSet: testGKENetworkParamSet("secondary-network-params", "secondary-vpc", "secondary-subnet"),
202-
service: &apiv1.Service{
203-
ObjectMeta: metav1.ObjectMeta{Name: "testService"},
204-
Spec: apiv1.ServiceSpec{
205-
Selector: map[string]string{
206-
networkSelector: "secondary-network",
207-
},
208-
ExternalTrafficPolicy: apiv1.ServiceExternalTrafficPolicyCluster,
209-
},
210-
},
211-
wantErr: "multinetwork services with externalTrafficPolicy='Cluster' are not supported, only externalTrafficPolicy=Local services are supported",
212-
},
213-
{
214-
desc: "service with externalTrafficPolicy default",
215-
network: testNetwork("secondary-network", "secondary-network-params"),
216-
gkeNetworkParamSet: testGKENetworkParamSet("secondary-network-params", "secondary-vpc", "secondary-subnet"),
217-
service: &apiv1.Service{
218-
ObjectMeta: metav1.ObjectMeta{Name: "testService"},
219-
Spec: apiv1.ServiceSpec{
220-
Selector: map[string]string{
221-
networkSelector: "secondary-network",
222-
},
223-
},
224-
},
225-
wantErr: "multinetwork services with externalTrafficPolicy='' are not supported, only externalTrafficPolicy=Local services are supported",
226-
},
227198
}
228199

229200
for _, tc := range cases {

0 commit comments

Comments
 (0)