optimize workload selector logic (#3360)

koderover · Feb 28, 2024 · aa85ec7 · aa85ec7
1 parent 240b1d9
commit aa85ec7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/pkg/microservice/aslan/core/common/service/environment.go b/pkg/microservice/aslan/core/common/service/environment.go
@@ -652,6 +652,7 @@ type Workload struct {
 	ProductName       string                 `json:"product_name"`
 	Replicas          int32                  `json:"-"`
 	Spec              corev1.PodTemplateSpec `json:"-"`
+	Selector          *metav1.LabelSelector  `json:"-"`
 	Images            []string               `json:"-"`
 	Ready             bool                   `json:"ready"`
 	Annotation        map[string]string      `json:"-"`
@@ -705,6 +706,7 @@ func ListWorkloads(envName, productName string, perPage, page int, informer info
 		workLoads = append(workLoads, &Workload{
 			Name:       v.Name,
 			Spec:       v.Spec.Template,
+			Selector:   v.Spec.Selector,
 			Type:       setting.Deployment,
 			Replicas:   *v.Spec.Replicas,
 			Images:     wrapper.Deployment(v).ImageInfos(),
@@ -720,6 +722,7 @@ func ListWorkloads(envName, productName string, perPage, page int, informer info
 		workLoads = append(workLoads, &Workload{
 			Name:       v.Name,
 			Spec:       v.Spec.Template,
+			Selector:   v.Spec.Selector,
 			Type:       setting.StatefulSet,
 			Replicas:   *v.Spec.Replicas,
 			Images:     wrapper.StatefulSet(v).ImageInfos(),
@@ -877,7 +880,7 @@ func ListWorkloadDetails(envName, clusterID, namespace, productName string, perP
 		}
 
 		if workload.Type == setting.Deployment || workload.Type == setting.StatefulSet {
-			selector := labels.SelectorFromSet(workload.Spec.Labels)
+			selector := labels.SelectorFromSet(workload.Selector.MatchLabels)
 			// Note: In some scenarios, such as environment sharing, there may be more containers in Pod than workload.
 			// We call GetSelectedPodsInfo to get the status and readiness to keep same logic with k8s projects
 			productRespInfo.Status, productRespInfo.Ready, productRespInfo.Images = kube.GetSelectedPodsInfo(selector, informer, workload.Images, log)
@@ -901,7 +904,7 @@ func FindServiceFromIngress(hostInfos []resource.HostInfo, currentWorkload *Work
 		return []resource.HostInfo{}
 	}
 	serviceName := ""
-	podLabels := labels.Set(currentWorkload.Spec.Labels)
+	podLabels := labels.Set(currentWorkload.Selector.MatchLabels)
 	for _, svc := range allServices {
 		if len(svc.Spec.Selector) == 0 {
 			continue

diff --git a/pkg/microservice/aslan/core/common/service/service.go b/pkg/microservice/aslan/core/common/service/service.go
@@ -1533,6 +1533,7 @@ func ToDeploymentWorkload(v *appsv1.Deployment) *Workload {
 	workload := &Workload{
 		Name:       v.Name,
 		Spec:       v.Spec.Template,
+		Selector:   v.Spec.Selector,
 		Type:       setting.Deployment,
 		Images:     wrapper.Deployment(v).ImageInfos(),
 		Ready:      wrapper.Deployment(v).Ready(),
@@ -1545,6 +1546,7 @@ func toStsWorkload(v *appsv1.StatefulSet) *Workload {
 	workload := &Workload{
 		Name:       v.Name,
 		Spec:       v.Spec.Template,
+		Selector:   v.Spec.Selector,
 		Type:       setting.StatefulSet,
 		Images:     wrapper.StatefulSet(v).ImageInfos(),
 		Ready:      wrapper.StatefulSet(v).Ready(),

diff --git a/pkg/microservice/aslan/core/environment/service/service.go b/pkg/microservice/aslan/core/environment/service/service.go
@@ -266,6 +266,7 @@ func GetServiceWorkloads(svcTmpl *commonmodels.Service, env *commonmodels.Produc
 			ret = append(ret, &commonservice.Workload{
 				Name:       wd.Name,
 				Spec:       wd.Spec.Template,
+				Selector:   wd.Spec.Selector,
 				Type:       setting.Deployment,
 				Images:     wd.ImageInfos(),
 				Ready:      wd.Ready(),
@@ -282,6 +283,7 @@ func GetServiceWorkloads(svcTmpl *commonmodels.Service, env *commonmodels.Produc
 			ret = append(ret, &commonservice.Workload{
 				Name:       ws.Name,
 				Spec:       ws.Spec.Template,
+				Selector:   ws.Spec.Selector,
 				Type:       setting.StatefulSet,
 				Images:     ws.ImageInfos(),
 				Ready:      ws.Ready(),