Add service name and group labels to environment variable mapping

Author: chenzhiguo

pkg/config/config.go

@@ -24,6 +24,8 @@ const (
 	ClusterIdEnvName       = "JOYLIVE_CLUSTER_ID"
 	DefaultNamespace       = "joylive"
 	AgentVersionLabel      = "x-live-version"
+	ServiceNameLabel       = "jmsf.jd.com/name"
+	ServiceGroupLabel      = "jmsf.jd.com/group"
 	ServiceSpaceLabel      = "jmsf.jd.com/space"
 	JdapServiceSpaceLabel  = "jmsf.jd.com/service-space"
 	ApplicationLabel       = "jmsf.jd.com/application"

pkg/mutation/mutation_deploy.go

@@ -87,11 +87,12 @@ func injectionDeploy(request *admissionv1.AdmissionRequest) (*admissionv1.Admiss
 		added := false
 		// Check if the x-live-enabled label exists in deploy's spec.template.metadata.labels; if not, add it.
 		if _, ok := deploy.Spec.Template.Labels[config.WebHookMatchKey]; !ok {
+			log.Infof("[mutation] /injection-deploy: add label %s to deployment %s/%s", config.WebHookMatchKey, deploy.Name, deploy.Namespace)
 			target.Spec.Template.Labels[config.WebHookMatchKey] = config.WebHookMatchValue
 			added = true
 		}
 
-		if len(config.ControlPlaneUrl) != 0 {
+		if len(config.ControlPlaneUrl) == 0 {
 			return &admissionv1.AdmissionResponse{
 				UID:     request.UID,
 				Allowed: true,

pkg/resource/control.go

@@ -58,6 +58,17 @@ func GetApplicationEnvironments(labels map[string]string) (map[string]string, er
 		envMaps["APPLICATION_NAME"] = application
 		envMaps["APPLICATION_SERVICE_NAMESPACE"] = serviceSpace
 	}
+
+	if group, ok := labels[config.ServiceGroupLabel]; ok {
+		envMaps["APPLICATION_SERVICE_GROUP"] = group
+	} else {
+		envMaps["APPLICATION_SERVICE_GROUP"] = "default"
+	}
+
+	if service, ok := labels[config.ServiceNameLabel]; ok {
+		envMaps["APPLICATION_SERVICE_NAME"] = service
+	}
+
 	envMaps["APPLICATION_LOCATION_CLUSTER"] = config.ClusterId
 
 	return envMaps, nil