enhance: labels from gs can be synced to pod (#160)

Signed-off-by: ChrisLiu <[email protected]>
openkruise · Aug 16, 2024 · 92475c1 · 92475c1
1 parent 26fcaf7
commit 92475c1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/pkg/controllers/gameserver/gameserver_manager.go b/pkg/controllers/gameserver/gameserver_manager.go
@@ -196,6 +196,17 @@ func (manager GameServerManager) SyncGsToPod() error {
 		}
 	}
 
+	// sync labels from gs to pod
+	for gsKey, gsValue := range gs.GetLabels() {
+		if util.IsHasPrefixGsSyncToPod(gsKey) {
+			podValue, exist := pod.GetLabels()[gsKey]
+			if exist && (podValue == gsValue) {
+				continue
+			}
+			newLabels[gsKey] = gsValue
+		}
+	}
+
 	// sync pod containers when the containers(images) in GameServer are different from that in pod.
 	containers := manager.syncPodContainers(gs.Spec.Containers, pod.DeepCopy().Spec.Containers)
 

diff --git a/pkg/controllers/gameserver/gameserver_manager_test.go b/pkg/controllers/gameserver/gameserver_manager_test.go
@@ -464,6 +464,7 @@ func TestSyncGsToPod(t *testing.T) {
 					Name:      "xxx-0",
 					Labels: map[string]string{
 						gameKruiseV1alpha1.GameServerOwnerGssKey: "xxx",
+						"gs-sync/pre-deleting":                   "false",
 					},
 					Annotations: map[string]string{
 						"meaningless-key":  "meaningless-value",
@@ -488,6 +489,7 @@ func TestSyncGsToPod(t *testing.T) {
 						gameKruiseV1alpha1.GameServerDeletePriorityKey: dp.String(),
 						gameKruiseV1alpha1.GameServerUpdatePriorityKey: up.String(),
 						gameKruiseV1alpha1.GameServerStateKey:          string(gameKruiseV1alpha1.Creating),
+						"gs-sync/pre-deleting":                         "false",
 					},
 					Annotations: map[string]string{
 						"gs-sync/match-id": "xxx-xxx-xx2",