github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Revert "[Federation] Fix federated service reconcilation issue due to addition of External…"

Browse Source
This commit is contained in:
Shashidhara T D 2017-05-19 18:29:07 +05:30 committed by GitHub
parent d651ef786c
commit 40c32b02d7
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
federation/pkg/federation-controller/service/servicecontroller.go
View File

@ -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. // Update existing service, if needed.
if !Equivalent(desiredService, clusterService) { if !Equivalent(desiredService, clusterService) {

11
test/e2e_federation/service.go
View File

@ -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 // 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. // federated services and the underlying cluster services (e.g. ClusterIP, NodePort) are ignored.
func equivalent(clusterService, federationService v1.Service) bool { func equivalent(federationService, clusterService v1.Service) bool {
federationService.Spec.ClusterIP = clusterService.Spec.ClusterIP clusterService.Spec.ClusterIP = federationService.Spec.ClusterIP
for i := range federationService.Spec.Ports { for i := range clusterService.Spec.Ports {
federationService.Spec.Ports[i].NodePort = clusterService.Spec.Ports[i].NodePort clusterService.Spec.Ports[i].NodePort = federationService.Spec.Ports[i].NodePort
}
if federationService.Spec.ExternalTrafficPolicy == v1.ServiceExternalTrafficPolicyType("") {
federationService.Spec.ExternalTrafficPolicy = clusterService.Spec.ExternalTrafficPolicy
} }
if federationService.Name != clusterService.Name || federationService.Namespace != clusterService.Namespace { if federationService.Name != clusterService.Name || federationService.Namespace != clusterService.Namespace {