karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6249 from ctripcloud/svc-aggregate-status 

don't add cluster name to hostname field when aggregate service status
This commit is contained in:
karmada-bot 2025-04-01 15:21:50 +08:00 committed by GitHub
parent 9ea0382293 1e3795e3b8
commit afe172d6a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/resourceinterpreter/default/native/aggregatestatus.go
View File

@ -145,13 +145,6 @@ func aggregateServiceStatus(object *unstructured.Unstructured, aggregatedStatusI
klog.V(3).Infof("Grab service(%s/%s) status from cluster(%s), loadBalancer status: %v", klog.V(3).Infof("Grab service(%s/%s) status from cluster(%s), loadBalancer status: %v",
service.Namespace, service.Name, item.ClusterName, temp.LoadBalancer) service.Namespace, service.Name, item.ClusterName, temp.LoadBalancer)
// Set cluster name as Hostname by default to indicate the status is collected from which member cluster.
for i := range temp.LoadBalancer.Ingress {
if temp.LoadBalancer.Ingress[i].Hostname == "" {
temp.LoadBalancer.Ingress[i].Hostname = item.ClusterName
}
}
newStatus.LoadBalancer.Ingress = append(newStatus.LoadBalancer.Ingress, temp.LoadBalancer.Ingress...) newStatus.LoadBalancer.Ingress = append(newStatus.LoadBalancer.Ingress, temp.LoadBalancer.Ingress...)
} }
@ -184,13 +177,6 @@ func aggregateIngressStatus(object *unstructured.Unstructured, aggregatedStatusI
klog.V(3).Infof("Grab ingress(%s/%s) status from cluster(%s), loadBalancer status: %v", klog.V(3).Infof("Grab ingress(%s/%s) status from cluster(%s), loadBalancer status: %v",
ingress.Namespace, ingress.Name, item.ClusterName, temp.LoadBalancer) ingress.Namespace, ingress.Name, item.ClusterName, temp.LoadBalancer)
// Set cluster name as Hostname by default to indicate the status is collected from which member cluster.
for i := range temp.LoadBalancer.Ingress {
if temp.LoadBalancer.Ingress[i].Hostname == "" {
temp.LoadBalancer.Ingress[i].Hostname = item.ClusterName
}
}
newStatus.LoadBalancer.Ingress = append(newStatus.LoadBalancer.Ingress, temp.LoadBalancer.Ingress...) newStatus.LoadBalancer.Ingress = append(newStatus.LoadBalancer.Ingress, temp.LoadBalancer.Ingress...)
} }

4
pkg/resourceinterpreter/default/native/aggregatestatus_test.go
View File

@ -129,7 +129,7 @@ func TestAggregateServiceStatus(t *testing.T) {
newServiceLoadBalancer := &corev1.Service{ newServiceLoadBalancer := &corev1.Service{
TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: corev1.SchemeGroupVersion.String()}, TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: corev1.SchemeGroupVersion.String()},
Spec: corev1.ServiceSpec{Type: corev1.ServiceTypeLoadBalancer}, Spec: corev1.ServiceSpec{Type: corev1.ServiceTypeLoadBalancer},
Status: corev1.ServiceStatus{LoadBalancer: corev1.LoadBalancerStatus{Ingress: []corev1.LoadBalancerIngress{{IP: "8.8.8.8", Hostname: "member1"}}}}, Status: corev1.ServiceStatus{LoadBalancer: corev1.LoadBalancerStatus{Ingress: []corev1.LoadBalancerIngress{{IP: "8.8.8.8"}}}},
} }
oldObjServiceLoadBalancer, _ := helper.ToUnstructured(oldServiceLoadBalancer) oldObjServiceLoadBalancer, _ := helper.ToUnstructured(oldServiceLoadBalancer)
newObjServiceLoadBalancer, _ := helper.ToUnstructured(newServiceLoadBalancer) newObjServiceLoadBalancer, _ := helper.ToUnstructured(newServiceLoadBalancer)
@ -192,7 +192,7 @@ func TestAggregateIngressStatus(t *testing.T) {
} }
newIngress := &networkingv1.Ingress{ newIngress := &networkingv1.Ingress{
TypeMeta: metav1.TypeMeta{Kind: "Ingress", APIVersion: networkingv1.SchemeGroupVersion.String()}, TypeMeta: metav1.TypeMeta{Kind: "Ingress", APIVersion: networkingv1.SchemeGroupVersion.String()},
Status: networkingv1.IngressStatus{LoadBalancer: networkingv1.IngressLoadBalancerStatus{Ingress: []networkingv1.IngressLoadBalancerIngress{{IP: "8.8.8.8", Hostname: "member1"}}}}, Status: networkingv1.IngressStatus{LoadBalancer: networkingv1.IngressLoadBalancerStatus{Ingress: []networkingv1.IngressLoadBalancerIngress{{IP: "8.8.8.8"}}}},
} }
oldObj, _ := helper.ToUnstructured(oldIngress) oldObj, _ := helper.ToUnstructured(oldIngress)
newObj, _ := helper.ToUnstructured(newIngress) newObj, _ := helper.ToUnstructured(newIngress)

8
test/e2e/suites/base/resource_test.go
View File

@ -175,9 +175,8 @@ var _ = ginkgo.Describe("[resource-status collection] resource status collection
ingresses := []corev1.LoadBalancerIngress{{IP: fmt.Sprintf("172.19.1.%d", index+6)}} ingresses := []corev1.LoadBalancerIngress{{IP: fmt.Sprintf("172.19.1.%d", index+6)}}
for _, ingress := range ingresses { for _, ingress := range ingresses {
svcLoadBalancer.Ingress = append(svcLoadBalancer.Ingress, corev1.LoadBalancerIngress{ svcLoadBalancer.Ingress = append(svcLoadBalancer.Ingress, corev1.LoadBalancerIngress{
IP: ingress.IP, IP: ingress.IP,
Hostname: clusterName, IPMode: ingress.IPMode,
IPMode: ingress.IPMode,
}) })
} }
@ -323,8 +322,7 @@ var _ = ginkgo.Describe("[resource-status collection] resource status collection
ingresses := []networkingv1.IngressLoadBalancerIngress{{IP: fmt.Sprintf("172.19.2.%d", index+6)}} ingresses := []networkingv1.IngressLoadBalancerIngress{{IP: fmt.Sprintf("172.19.2.%d", index+6)}}
for _, ingress := range ingresses { for _, ingress := range ingresses {
ingLoadBalancer.Ingress = append(ingLoadBalancer.Ingress, networkingv1.IngressLoadBalancerIngress{ ingLoadBalancer.Ingress = append(ingLoadBalancer.Ingress, networkingv1.IngressLoadBalancerIngress{
IP: ingress.IP, IP: ingress.IP,
Hostname: clusterName,
}) })
} }