Add JOYLIVE_MATCH_KEY and JOYLIVE_MATCH_VALUE environment variables to deployment

Author: chenzhiguo

deploy/all-cr.yaml

@@ -751,6 +751,10 @@ spec:
               value: 
             - name: JOYLIVE_CLUSTER_ID
               value: 
+            - name: JOYLIVE_MATCH_KEY
+              value: x-live-enabled
+            - name: JOYLIVE_MATCH_VALUE
+              value: "true"
           name: joylive-injector
           image: ghcr.m.daocloud.io/jd-opensource/joylive-injector:v1.2.2
           imagePullPolicy: Always

deploy/joylive-injector/templates/deployment.yaml

@@ -38,6 +38,10 @@ spec:
               value: {{ .Values.controlPlaneUrl }}
             - name: JOYLIVE_CLUSTER_ID
               value: {{ .Values.clusterId }}
+            - name: JOYLIVE_MATCH_KEY
+              value: {{ .Values.matchLabels.matchKey}}
+            - name: JOYLIVE_MATCH_VALUE
+              value: {{ .Values.matchLabels.matchValue }}
           name: joylive-injector
           image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}

deploy/packages/joylive-injector-1.3.7.tgz

@@ -28,15 +28,19 @@ const (
 	JdapServiceSpaceLabel  = "jmsf.jd.com/service-space"
 	ApplicationLabel       = "jmsf.jd.com/application"
 	JdapApplicationLabel   = "app.jdap.io/name"
+	WebHookMatchKeyEnv     = "JOYLIVE_MATCH_KEY"
+	WebHookMatchValueEnv   = "JOYLIVE_MATCH_VALUE"
 )
 
 var (
-	Cert            string
-	Key             string
-	Addr            string
-	MatchLabels     string
-	ControlPlaneUrl string
-	ClusterId       string
+	Cert              string
+	Key               string
+	Addr              string
+	MatchLabels       string
+	ControlPlaneUrl   string
+	ClusterId         string
+	WebHookMatchKey   string
+	WebHookMatchValue string
 )
 
 // injection_deploy config
@@ -59,6 +63,8 @@ func init() {
 	ControlPlaneUrl = os.Getenv(ControlPlaneUrlEnvName)
 	// Initialize the default cluster id from environment variables
 	ClusterId = os.Getenv(ClusterIdEnvName)
+	WebHookMatchKey = os.Getenv(WebHookMatchKeyEnv)
+	WebHookMatchValue = os.Getenv(WebHookMatchValueEnv)
 }
 
 func GetNamespace() string {

pkg/config/config.go

@@ -82,13 +82,57 @@ func injectionDeploy(request *admissionv1.AdmissionRequest) (*admissionv1.Admiss
 				},
 			}, nil
 		}
-		if len(config.ControlPlaneUrl) == 0 {
+
+		target := deploy.DeepCopy()
+		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 {
+			target.Spec.Template.Labels[config.WebHookMatchKey] = config.WebHookMatchValue
+			added = true
+		}
+
+		if len(config.ControlPlaneUrl) != 0 {
 			return &admissionv1.AdmissionResponse{
 				UID:     request.UID,
 				Allowed: true,
 			}, nil
 		} else {
-			return AddApplicationEnvironments(request, deploy)
+			err := AddApplicationEnvironments(deploy, target, added)
+			if err != nil {
+				errMsg := fmt.Sprintf("[mutation] /injection-deploy: failed to get application environments: %v", err)
+				return &admissionv1.AdmissionResponse{
+					Allowed: false,
+					Result: &metav1.Status{
+						Code:    http.StatusInternalServerError,
+						Message: errMsg,
+					},
+				}, err
+			}
+		}
+		if !added {
+			log.Infof("[mutation] /injection-deploy: no envs to add to deployment %s/%s", deploy.Name, deploy.Namespace)
+			return &admissionv1.AdmissionResponse{
+				UID:     request.UID,
+				Allowed: true,
+			}, nil
+		} else {
+			patchStr, err := createDeployPatch(target, &deploy)
+			if err != nil {
+				log.Errorf("[mutation] /injection-deploy: failed to create patch: %v", err)
+				return &admissionv1.AdmissionResponse{
+					UID:     request.UID,
+					Allowed: true,
+				}, nil
+			}
+			return &admissionv1.AdmissionResponse{
+				UID:     request.UID,
+				Allowed: true,
+				Patch:   patchStr,
+				PatchType: func() *admissionv1.PatchType {
+					pt := admissionv1.PatchTypeJSONPatch
+					return &pt
+				}(),
+			}, nil
 		}
 	default:
 		return &admissionv1.AdmissionResponse{
@@ -98,22 +142,12 @@ func injectionDeploy(request *admissionv1.AdmissionRequest) (*admissionv1.Admiss
 	}
 }
 
-func AddApplicationEnvironments(request *apiv1.AdmissionRequest, deploy appsv1.Deployment) (*apiv1.AdmissionResponse, error) {
+func AddApplicationEnvironments(source appsv1.Deployment, target *appsv1.Deployment, added bool) error {
 	// Get the application environment variables
-	envs, err := resource.GetApplicationEnvironments(deploy.GetLabels())
+	envs, err := resource.GetApplicationEnvironments(source.GetLabels())
 	if err != nil {
-		errMsg := fmt.Sprintf("[mutation] /injection-deploy: failed to get application environments: %v", err)
-		log.Error(errMsg)
-		return &admissionv1.AdmissionResponse{
-			Allowed: false,
-			Result: &metav1.Status{
-				Code:    http.StatusInternalServerError,
-				Message: errMsg,
-			},
-		}, err
+		return err
 	}
-	target := deploy.DeepCopy()
-	added := false
 	for k, v := range envs {
 		// Check if the environment variable already exists
 		exists := false
@@ -132,32 +166,8 @@ func AddApplicationEnvironments(request *apiv1.AdmissionRequest, deploy appsv1.D
 		added = true
 	}
 	log.Infof("[mutation] /injection-deploy: add envs to deployment %s/%s, envs: %v, deploy's envs: %v",
-		deploy.Name, deploy.Namespace, envs, target.Spec.Template.Spec.Containers[0].Env)
-	if added {
-		patchStr, err := createDeployPatch(target, &deploy)
-		if err != nil {
-			log.Errorf("[mutation] /injection-deploy: failed to create patch: %v", err)
-			return &admissionv1.AdmissionResponse{
-				UID:     request.UID,
-				Allowed: true,
-			}, nil
-		}
-		return &admissionv1.AdmissionResponse{
-			UID:     request.UID,
-			Allowed: true,
-			Patch:   patchStr,
-			PatchType: func() *admissionv1.PatchType {
-				pt := admissionv1.PatchTypeJSONPatch
-				return &pt
-			}(),
-		}, nil
-	} else {
-		log.Infof("[mutation] /injection-deploy: no envs to add to deployment %s/%s", deploy.Name, deploy.Namespace)
-		return &admissionv1.AdmissionResponse{
-			UID:     request.UID,
-			Allowed: true,
-		}, nil
-	}
+		source.Name, source.Namespace, envs, target.Spec.Template.Spec.Containers[0].Env)
+	return nil
 }
 
 func createOrUpdateConfigMap(deploy *appsv1.Deployment) error {