fix: resolve conflicts

Author: knave

internal/component/client.go

@@ -68,8 +68,8 @@ func (c *Client) GetResourcesInfo(r client.Client, ctx context.Context, pool *tf
 	podList := &corev1.PodList{}
 	if err := r.List(ctx, podList,
 		client.MatchingLabels{
-			constants.TensorFusionEnabledLabelKey:                              constants.LabelValueTrue,
-			fmt.Sprintf(constants.GPUNodePoolIdentifierLabelFormat, pool.Name): constants.LabelValueTrue,
+			constants.TensorFusionEnabledLabelKey: constants.TrueStringValue,
+			constants.GpuPoolKey:                  pool.Name,
 		}); err != nil {
 		return 0, 0, false, fmt.Errorf("failed to list pods: %w", err)
 	}

internal/component/worker.go

@@ -68,7 +68,7 @@ func (w *Worker) GetResourcesInfo(r client.Client, ctx context.Context, pool *tf
 	log := log.FromContext(ctx)
 	workloadList := &tfv1.TensorFusionWorkloadList{}
 	if err := r.List(ctx, workloadList, client.MatchingLabels(map[string]string{
-		constants.LabelKeyOwner: pool.Name,
+		constants.GpuPoolKey: pool.Name,
 	})); err != nil {
 		return 0, 0, false, fmt.Errorf("failed to list workloads : %w", err)
 	}
@@ -85,7 +85,7 @@ func (w *Worker) GetResourcesInfo(r client.Client, ctx context.Context, pool *tf
 			log.Info("workload in pending status", "name", workload.Name)
 			return 0, 0, true, nil
 		}
-		podTemplateHash, err := workerGenerator.PodTemplateHash(workload.Spec.Resources.Limits)
+		podTemplateHash, err := workerGenerator.PodTemplateHash(workload.Spec)
 		if err != nil {
 			return 0, 0, false, fmt.Errorf("failed to get pod template hash: %w", err)
 		}

internal/controller/gpunode_controller.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"reflect"
 	"strings"
 	"time"
 
@@ -32,6 +31,7 @@ import (
 	"github.com/NexusGPU/tensor-fusion/internal/utils"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -256,7 +256,7 @@ func (r *GPUNodeReconciler) checkStatusAndUpdateVirtualCapacity(ctx context.Cont
 
 		node.Status.Phase = tfv1.TensorFusionGPUNodePhaseRunning
 
-		if !reflect.DeepEqual(node.Status, statusCopy) {
+		if !equality.Semantic.DeepEqual(node.Status, statusCopy) {
 			err = r.Status().Update(ctx, node)
 			if err != nil {
 				return true, fmt.Errorf("failed to update GPU node status: %w", err)

internal/controller/gpupool_controller_test.go

@@ -695,9 +695,9 @@ func createClientPodByIndex(tfEnv *TensorFusionEnv, index int) {
 			Name:      getClientPodName(index),
 			Namespace: utils.CurrentNamespace(),
 			Labels: map[string]string{
-				constants.TensorFusionEnabledLabelKey:                              constants.LabelValueTrue,
-				fmt.Sprintf(constants.GPUNodePoolIdentifierLabelFormat, pool.Name): constants.LabelValueTrue,
-				constants.LabelKeyPodTemplateHash:                                  utils.GetObjectHash(pool.Spec.ComponentConfig.Client),
+				constants.TensorFusionEnabledLabelKey: constants.TrueStringValue,
+				constants.GpuPoolKey:                  pool.Name,
+				constants.LabelKeyPodTemplateHash:     utils.GetObjectHash(pool.Spec.ComponentConfig.Client),
 			},
 		},
 		Spec: corev1.PodSpec{
@@ -727,9 +727,9 @@ func createClientPods(tfEnv *TensorFusionEnv, count int) {
 				Name:      getClientPodName(i),
 				Namespace: utils.CurrentNamespace(),
 				Labels: map[string]string{
-					constants.TensorFusionEnabledLabelKey:                              constants.LabelValueTrue,
-					fmt.Sprintf(constants.GPUNodePoolIdentifierLabelFormat, pool.Name): constants.LabelValueTrue,
-					constants.LabelKeyPodTemplateHash:                                  utils.GetObjectHash(pool.Spec.ComponentConfig.Client),
+					constants.TensorFusionEnabledLabelKey: constants.TrueStringValue,
+					constants.GpuPoolKey:                  pool.Name,
+					constants.LabelKeyPodTemplateHash:     utils.GetObjectHash(pool.Spec.ComponentConfig.Client),
 				},
 			},
 			Spec: corev1.PodSpec{

internal/controller/tensorfusionworkload_controller_test.go

@@ -273,7 +273,7 @@ func createTensorFusionWorkload(poolName string, key client.ObjectKey, replicas
 			Name:      key.Name,
 			Namespace: key.Namespace,
 			Labels: map[string]string{
-				constants.LabelKeyOwner: poolName,
+				constants.GpuPoolKey: poolName,
 			},
 		},
 		Spec: tfv1.WorkloadProfileSpec{

internal/webhook/v1/pod_webhook.go

@@ -124,12 +124,6 @@ func (m *TensorFusionPodMutator) Handle(ctx context.Context, req admission.Reque
 		nodeSelector = workloadStatus.NodeSelector
 	}
 
-	if pod.Labels == nil {
-		pod.Labels = map[string]string{}
-	}
-	pod.Labels[constants.LabelKeyPodTemplateHash] = utils.GetObjectHash(pool.Spec.ComponentConfig)
-	pod.Labels[constants.LabelKeyOwner] = pool.Name
-
 	// Inject initContainer and env variables
 	patches, err := m.patchTFClient(pod, pool, tfInfo.ContainerNames, nodeSelector)
 	if err != nil {
@@ -262,13 +256,14 @@ func (m *TensorFusionPodMutator) patchTFClient(
 		}
 	}
 
+	clientConfig := pool.Spec.ComponentConfig.Client
+
 	if pod.Labels == nil {
 		pod.Labels = map[string]string{}
 	}
-	pod.Labels[constants.LabelKeyPodTemplateHash] = utils.GetObjectHash(pool.Spec.ComponentConfig)
-	pod.Labels[fmt.Sprintf(constants.GPUNodePoolIdentifierLabelFormat, pool.Name)] = constants.LabelValueTrue
+	pod.Labels[constants.LabelKeyPodTemplateHash] = utils.GetObjectHash(clientConfig)
+	pod.Labels[constants.GpuPoolKey] = pool.Name
 
-	clientConfig := pool.Spec.ComponentConfig.Client
 	containerPatched := false
 	// Patch to Container
 	for _, name := range containerNames {