Skip to content

K
k3s
Commit f038c549 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45798 from shashidharatd/federated-service

Automatic merge from submit-queue [Federation] Fix federated service reconcilation issue due to addition of External… …TrafficPolicy field to v1.Service **What this PR does / why we need it**: New fields (ExternalTrafficPolicy) are introduced to v1.Service by this PR #41162. If this field is not specified in service spec, the service controller will assign default and updates the service spec. In federation, the service spec is not updated and we continuously try to reconcile as the federated service and the service in federated cluster do not match. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #45795 **Special notes for your reviewer**: **Release note**: ``` NONE ``` cc @kubernetes/sig-federation-bugs @madhusudancs
parents 885ddcc1 d2252752
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
federation/pkg/federation-controller/service/servicecontroller.go
View file @ f038c549
...@@ -664,6 +664,11 @@ func (s *ServiceController) getOperationsToPerformOnCluster(cluster *v1beta1.Clu ...@@ -664,6 +664,11 @@ 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) {
......
test/e2e_federation/service.go
View file @ f038c549
...@@ -379,10 +379,13 @@ func deleteServiceShard(c *fedframework.Cluster, namespace, service string) erro ...@@ -379,10 +379,13 @@ 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(federationService, clusterService v1.Service) bool { func equivalent(clusterService, federationService v1.Service) bool {
clusterService.Spec.ClusterIP = federationService.Spec.ClusterIP federationService.Spec.ClusterIP = clusterService.Spec.ClusterIP
for i := range clusterService.Spec.Ports { for i := range federationService.Spec.Ports {
clusterService.Spec.Ports[i].NodePort = federationService.Spec.Ports[i].NodePort federationService.Spec.Ports[i].NodePort = clusterService.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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment