feat: core erda k8s labels

internal/tools/orchestrator/scheduler/executor/plugins/k8s/daemonset.go

@@ -93,9 +93,35 @@ func (k *Kubernetes) updateDaemonSet(ctx context.Context, ds *appsv1.DaemonSet,
 			return errors.New(reason)
 		}
 	}
+	err = k.mergeDaemonLabels(ds)
+	if err != nil {
+		logrus.Errorf("failed to merge daemonset labels, name: %s, (%v)", service.Name, err)
+		return errors.Errorf("failed to merge daemonset labels, name: %s, (%v)", service.Name, err)
+	}
 	return k.ds.Update(ds)
 }
 
+func (k *Kubernetes) mergeDaemonLabels(ds *appsv1.DaemonSet) error {
+	oldDaemon, err := k.getDaemonSet(ds.Namespace, ds.Name)
+	if err != nil {
+		return err
+	}
+	for key, value := range oldDaemon.Labels {
+		if _, ok := ds.Labels[key]; ok {
+			continue
+		}
+		ds.Labels[key] = value
+	}
+
+	for key, value := range oldDaemon.Spec.Template.Labels {
+		if _, ok := ds.Spec.Template.Labels[key]; ok {
+			continue
+		}
+		ds.Spec.Template.Labels[key] = value
+	}
+	return nil
+}
+
 func (k *Kubernetes) getDaemonSetDeltaResource(ctx context.Context, ds *appsv1.DaemonSet) (deltaCPU, deltaMemory int64, err error) {
 	oldDs, err := k.k8sClient.ClientSet.AppsV1().DaemonSets(ds.Namespace).Get(ctx, ds.Name, metav1.GetOptions{})
 	if err != nil {
@@ -244,13 +270,6 @@ func (k *Kubernetes) newDaemonSet(service *apistructs.Service, sg *apistructs.Se
 	}
 	podAnnotations(service, daemonset.Spec.Template.Annotations)
 
-	// inherit Labels from service.Labels and service.DeploymentLabels
-	err = inheritDaemonsetLabels(service, daemonset)
-	if err != nil {
-		logrus.Errorf("failed to set labels for service %s for Pod with error: %v\n", service.Name, err)
-		return nil, err
-	}
-
 	// set pod Annotations from service.Labels and service.DeploymentLabels
 	setPodAnnotationsFromLabels(service, daemonset.Spec.Template.Annotations)
 
@@ -289,6 +308,17 @@ func (k *Kubernetes) newDaemonSet(service *apistructs.Service, sg *apistructs.Se
 
 	SetPodAnnotationsBaseContainerEnvs(daemonset.Spec.Template.Spec.Containers[0], daemonset.Spec.Template.Annotations)
 
+	err = setCoreErdaLabels(sg, service, daemonset.Labels)
+	if err != nil {
+		logrus.Errorf("daemonset can't set core/erda labels, err: %v", err)
+		return nil, err
+	}
+	err = setCoreErdaLabels(sg, service, daemonset.Spec.Template.Labels)
+	if err != nil {
+		logrus.Errorf("daemonset template can't set core/erda labels, err: %v", err)
+		return nil, err
+	}
+
 	secrets, err := k.CopyErdaSecrets("secret", service.Namespace)
 	if err != nil {
 		logrus.Errorf("failed to copy secret: %v", err)

internal/tools/orchestrator/scheduler/executor/plugins/k8s/deployment.go

@@ -164,6 +164,11 @@ func (k *Kubernetes) putDeployment(ctx context.Context, deployment *appsv1.Deplo
 		}
 	}
 
+	err = k.mergeDeployLabels(deployment)
+	if err != nil {
+		return errors.Errorf("failed to merge deployment labels, name: %s, (%v)", service.Name, err)
+	}
+
 	err = k.deploy.Put(deployment)
 	if err != nil {
 		return errors.Errorf("failed to update deployment, name: %s, (%v)", service.Name, err)
@@ -178,6 +183,27 @@ func (k *Kubernetes) putDeployment(ctx context.Context, deployment *appsv1.Deplo
 	return nil
 }
 
+func (k *Kubernetes) mergeDeployLabels(deployment *appsv1.Deployment) error {
+	oldDeploy, err := k.deploy.Get(deployment.Namespace, deployment.Name)
+	if err != nil {
+		return err
+	}
+	for key, value := range oldDeploy.Labels {
+		if _, ok := deployment.Labels[key]; ok {
+			continue
+		}
+		deployment.Labels[key] = value
+	}
+
+	for key, value := range oldDeploy.Spec.Template.Labels {
+		if _, ok := deployment.Spec.Template.Labels[key]; ok {
+			continue
+		}
+		deployment.Spec.Template.Labels[key] = value
+	}
+	return nil
+}
+
 func (k *Kubernetes) getDeploymentDeltaResource(ctx context.Context, deploy *appsv1.Deployment) (deltaCPU, deltaMemory int64, err error) {
 	oldDeploy, err := k.k8sClient.ClientSet.AppsV1().Deployments(deploy.Namespace).Get(ctx, deploy.Name, metav1.GetOptions{})
 	if err != nil {
@@ -616,13 +642,6 @@ func (k *Kubernetes) newDeployment(service *apistructs.Service, serviceGroup *ap
 	}
 	podAnnotations(service, deployment.Spec.Template.Annotations)
 
-	// inherit Labels from service.Labels and service.DeploymentLabels
-	err = inheritDeploymentLabels(service, deployment)
-	if err != nil {
-		logrus.Errorf("failed to set labels for service %s for Pod with error: %v\n", service.Name, err)
-		return nil, err
-	}
-
 	// set pod Annotations from service.Labels and service.DeploymentLabels
 	setPodAnnotationsFromLabels(service, deployment.Spec.Template.Annotations)
 
@@ -660,6 +679,17 @@ func (k *Kubernetes) newDeployment(service *apistructs.Service, serviceGroup *ap
 
 	SetPodAnnotationsBaseContainerEnvs(deployment.Spec.Template.Spec.Containers[0], deployment.Spec.Template.Annotations)
 
+	err = setCoreErdaLabels(serviceGroup, service, deployment.Labels)
+	if err != nil {
+		logrus.Errorf("deployment can't set core/erda labels, err: %v", err)
+		return nil, err
+	}
+	err = setCoreErdaLabels(serviceGroup, service, deployment.Spec.Template.Labels)
+	if err != nil {
+		logrus.Errorf("deployment template can't set core/erda labels, err: %v", err)
+		return nil, err
+	}
+
 	// TODO: Delete this logic
 	//Mobil temporary demand:
 	// Inject the secret under the "secret" namespace into the business container
@@ -691,6 +721,36 @@ func (k *Kubernetes) newDeployment(service *apistructs.Service, serviceGroup *ap
 	return deployment, nil
 }
 
+func setCoreErdaLabels(sg *apistructs.ServiceGroup, service *apistructs.Service, labels map[string]string) error {
+	if labels == nil {
+		return nil
+	}
+	if service != nil {
+		labels["core.erda.cloud/cluster-name"] = service.Labels["DICE_CLUSTER_NAME"]
+		labels["core.erda.cloud/org-id"] = service.Labels["DICE_ORG_ID"]
+		labels["core.erda.cloud/org-name"] = service.Labels["DICE_ORG_NAME"]
+		labels["core.erda.cloud/app-id"] = service.Labels["DICE_APPLICATION_ID"]
+		labels["core.erda.cloud/app-name"] = service.Labels["DICE_APPLICATION_NAME"]
+		labels["core.erda.cloud/project-id"] = service.Labels["DICE_PROJECT_ID"]
+		labels["core.erda.cloud/project-name"] = service.Labels["DICE_PROJECT_NAME"]
+		labels["core.erda.cloud/runtime-id"] = service.Labels["DICE_RUNTIME_ID"]
+		labels["core.erda.cloud/service-name"] = service.Labels["DICE_SERVICE_NAME"]
+		labels["core.erda.cloud/workspace"] = service.Labels["DICE_WORKSPACE"]
+		labels["core.erda.cloud/service-type"] = service.Labels["SERVICE_TYPE"]
+		publicHost := make(map[string]string)
+		err := json.Unmarshal([]byte(service.Env["PUBLIC_HOST"]), &publicHost)
+		if err != nil {
+			return err
+		}
+		labels["monitor.erda.cloud/tenant-id"] = publicHost["terminusKey"]
+	}
+
+	if sg != nil {
+		labels["core.erda.cloud/servicegroup-id"] = sg.ID
+	}
+	return nil
+}
+
 func (k *Kubernetes) generateInitContainer(initcontainers map[string]diceyml.InitContainer) []corev1.Container {
 	containers := []corev1.Container{}
 	if initcontainers == nil {

internal/tools/orchestrator/scheduler/executor/plugins/k8s/service.go

@@ -112,7 +112,6 @@ func newService(service *apistructs.Service, selectors map[string]string) *apiv1
 	if len(service.Ports) == 0 {
 		return nil
 	}
-
 	k8sService := &apiv1.Service{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "v1",
@@ -153,6 +152,12 @@ func newService(service *apistructs.Service, selectors map[string]string) *apiv1
 		}
 	}
 
+	err := setCoreErdaLabels(nil, service, k8sService.Labels)
+	if err != nil {
+		logrus.Error(err)
+		return k8sService
+	}
+
 	for i, port := range service.Ports {
 		k8sService.Spec.Ports = append(k8sService.Spec.Ports, apiv1.ServicePort{
 			// TODO: name?
@@ -341,7 +346,10 @@ func (k *Kubernetes) UpdateK8sService(k8sService *apiv1.Service, service *apistr
 
 	setServiceLabelSelector(k8sService, selectors)
 	k8sService.Spec.Ports = newPorts
-
+	err := setCoreErdaLabels(nil, service, k8sService.Labels)
+	if err != nil {
+		return fmt.Errorf("can't set erda labels")
+	}
 	if err := k.PutService(k8sService); err != nil {
 		errMsg := fmt.Sprintf("update service err %v", err)
 		logrus.Error(errMsg)