From 40c32b02d7dfda882b61a6e7ec6336c3c1f9f2b0 Mon Sep 17 00:00:00 2001 From: Shashidhara T D Date: Fri, 19 May 2017 18:29:07 +0530 Subject: [PATCH] =?UTF-8?q?Revert=20"[Federation]=20Fix=20federated=20serv?= =?UTF-8?q?ice=20reconcilation=20issue=20due=20to=20addition=20of=20Extern?= =?UTF-8?q?al=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/servicecontroller.go | 5 ----- test/e2e_federation/service.go | 11 ++++------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/federation/pkg/federation-controller/service/servicecontroller.go b/federation/pkg/federation-controller/service/servicecontroller.go index 69a547aa185..a60fbb0428e 100644 --- a/federation/pkg/federation-controller/service/servicecontroller.go +++ b/federation/pkg/federation-controller/service/servicecontroller.go @@ -575,11 +575,6 @@ func (s *ServiceController) getOperationsToPerformOnCluster(cluster *v1beta1.Clu } } } - // If ExternalTrafficPolicy is not set in federated service, use the ExternalTrafficPolicy - // defaulted to in federated cluster. - if desiredService.Spec.ExternalTrafficPolicy == v1.ServiceExternalTrafficPolicyType("") { - desiredService.Spec.ExternalTrafficPolicy = clusterService.Spec.ExternalTrafficPolicy - } // Update existing service, if needed. if !Equivalent(desiredService, clusterService) { diff --git a/test/e2e_federation/service.go b/test/e2e_federation/service.go index 376b9f7a2c1..6ff708b59fa 100644 --- a/test/e2e_federation/service.go +++ b/test/e2e_federation/service.go @@ -379,13 +379,10 @@ func deleteServiceShard(c *fedframework.Cluster, namespace, service string) erro // equivalent returns true if the two services are equivalent. Fields which are expected to differ between // federated services and the underlying cluster services (e.g. ClusterIP, NodePort) are ignored. -func equivalent(clusterService, federationService v1.Service) bool { - federationService.Spec.ClusterIP = clusterService.Spec.ClusterIP - for i := range federationService.Spec.Ports { - federationService.Spec.Ports[i].NodePort = clusterService.Spec.Ports[i].NodePort - } - if federationService.Spec.ExternalTrafficPolicy == v1.ServiceExternalTrafficPolicyType("") { - federationService.Spec.ExternalTrafficPolicy = clusterService.Spec.ExternalTrafficPolicy +func equivalent(federationService, clusterService v1.Service) bool { + clusterService.Spec.ClusterIP = federationService.Spec.ClusterIP + for i := range clusterService.Spec.Ports { + clusterService.Spec.Ports[i].NodePort = federationService.Spec.Ports[i].NodePort } if federationService.Name != clusterService.Name || federationService.Namespace != clusterService.Namespace {