feat: add topology spread on game rooms

Add to Game Room pod spec the topology spread constraint with a maxSkew based on zone. If not match, we schedule anyway.
topfreegames · Sep 18, 2024 · b65f7c0 · b65f7c0
1 parent b2ca233
commit b65f7c0
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 0 deletions.
diff --git a/internal/adapters/runtime/kubernetes/game_room_convert.go b/internal/adapters/runtime/kubernetes/game_room_convert.go
@@ -87,6 +87,18 @@ func convertGameRoomSpec(scheduler entities.Scheduler, gameRoomName string, game
 			Containers:                    []v1.Container{},
 			Tolerations:                   convertSpecTolerations(gameRoomSpec),
 			Affinity:                      convertSpecAffinity(gameRoomSpec),
+			TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+				{
+					MaxSkew:           1,
+					TopologyKey:       "topology.kubernetes.io/zone",
+					WhenUnsatisfiable: v1.ScheduleAnyway,
+					LabelSelector: &metav1.LabelSelector{
+						MatchLabels: map[string]string{
+							schedulerLabelKey: scheduler.Name,
+						},
+					},
+				},
+			},
 		},
 	}
 	for _, container := range gameRoomSpec.Containers {

diff --git a/internal/adapters/runtime/kubernetes/game_room_convert_test.go b/internal/adapters/runtime/kubernetes/game_room_convert_test.go
@@ -400,6 +400,20 @@ func TestConvertGameSpec(t *testing.T) {
 						safeToEvictAnnotation: safeToEvictValue,
 					},
 				},
+				Spec: v1.PodSpec{
+					TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+						{
+							MaxSkew:           1,
+							TopologyKey:       "topology.kubernetes.io/zone",
+							WhenUnsatisfiable: v1.ScheduleAnyway,
+							LabelSelector: &metav1.LabelSelector{
+								MatchLabels: map[string]string{
+									schedulerLabelKey: "sample",
+								},
+							},
+						},
+					},
+				},
 			},
 		},
 		"with containers": {
@@ -432,6 +446,18 @@ func TestConvertGameSpec(t *testing.T) {
 						{},
 						{},
 					},
+					TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+						{
+							MaxSkew:           1,
+							TopologyKey:       "topology.kubernetes.io/zone",
+							WhenUnsatisfiable: v1.ScheduleAnyway,
+							LabelSelector: &metav1.LabelSelector{
+								MatchLabels: map[string]string{
+									schedulerLabelKey: "sample",
+								},
+							},
+						},
+					},
 				},
 			},
 		},
@@ -461,6 +487,18 @@ func TestConvertGameSpec(t *testing.T) {
 					Tolerations: []v1.Toleration{
 						{},
 					},
+					TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+						{
+							MaxSkew:           1,
+							TopologyKey:       "topology.kubernetes.io/zone",
+							WhenUnsatisfiable: v1.ScheduleAnyway,
+							LabelSelector: &metav1.LabelSelector{
+								MatchLabels: map[string]string{
+									schedulerLabelKey: "sample",
+								},
+							},
+						},
+					},
 				},
 			},
 		},
@@ -488,6 +526,18 @@ func TestConvertGameSpec(t *testing.T) {
 				},
 				Spec: v1.PodSpec{
 					Affinity: &v1.Affinity{},
+					TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+						{
+							MaxSkew:           1,
+							TopologyKey:       "topology.kubernetes.io/zone",
+							WhenUnsatisfiable: v1.ScheduleAnyway,
+							LabelSelector: &metav1.LabelSelector{
+								MatchLabels: map[string]string{
+									schedulerLabelKey: "sample",
+								},
+							},
+						},
+					},
 				},
 			},
 		},
@@ -519,6 +569,18 @@ func TestConvertGameSpec(t *testing.T) {
 				},
 				Spec: v1.PodSpec{
 					Affinity: &v1.Affinity{},
+					TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+						{
+							MaxSkew:           1,
+							TopologyKey:       "topology.kubernetes.io/zone",
+							WhenUnsatisfiable: v1.ScheduleAnyway,
+							LabelSelector: &metav1.LabelSelector{
+								MatchLabels: map[string]string{
+									schedulerLabelKey: "sample",
+								},
+							},
+						},
+					},
 				},
 			},
 		},
@@ -550,6 +612,18 @@ func TestConvertGameSpec(t *testing.T) {
 				},
 				Spec: v1.PodSpec{
 					Affinity: &v1.Affinity{},
+					TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+						{
+							MaxSkew:           1,
+							TopologyKey:       "topology.kubernetes.io/zone",
+							WhenUnsatisfiable: v1.ScheduleAnyway,
+							LabelSelector: &metav1.LabelSelector{
+								MatchLabels: map[string]string{
+									schedulerLabelKey: "sample",
+								},
+							},
+						},
+					},
 				},
 			},
 		},
@@ -577,6 +651,18 @@ func TestConvertGameSpec(t *testing.T) {
 				},
 				Spec: v1.PodSpec{
 					TerminationGracePeriodSeconds: int64Pointer(10),
+					TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+						{
+							MaxSkew:           1,
+							TopologyKey:       "topology.kubernetes.io/zone",
+							WhenUnsatisfiable: v1.ScheduleAnyway,
+							LabelSelector: &metav1.LabelSelector{
+								MatchLabels: map[string]string{
+									schedulerLabelKey: "sample",
+								},
+							},
+						},
+					},
 				},
 			},
 		},