Parameterize # of GameServer Creation/Deletion

pkg/operator/config/manager/manager.yaml

@@ -46,6 +46,10 @@ spec:
               value: ${API_SERVICE_SECURITY}
             - name: ALLOC_API_SVC_PORT
               value: "5000"
+            - name: MAX_NUM_GS_TO_ADD
+              value: "20"
+            - name: MAX_NUM_GS_TO_DEL
+              value: "20"
             - name: THUNDERNETES_INIT_CONTAINER_IMAGE
               value: ${IMAGE_NAME_INIT_CONTAINER}:${IMAGE_TAG}
             - name: THUNDERNETES_INIT_CONTAINER_IMAGE_WIN

pkg/operator/controllers/gameserverbuild_controller.go

@@ -43,14 +43,6 @@ import (
 // value is the number of crashes
 var crashesPerBuild = sync.Map{}
 
-const (
-	// maximum number of GameServers to create per reconcile loop
-	// we have this in place since each create call is synchronous and we want to minimize the time for each reconcile loop
-	maxNumberOfGameServersToAdd = 20
-	// maximum number of GameServers to delete per reconcile loop
-	maxNumberOfGameServersToDelete = 20
-)
-
 // Simple async map implementation using a mutex
 // used to manage the expected GameServer creations and deletions
 type MutexMap struct {
@@ -65,17 +57,24 @@ type GameServerBuildReconciler struct {
 	PortRegistry *PortRegistry
 	Recorder     record.EventRecorder
 	expectations *GameServerExpectations
+	//maximum number of GameServers to add per reconcile loop
+	// we have this in place since each create call is synchronous and we want to minimize the time for each reconcile loop
+	maxNumberOfGameServersToAdd int
+	//maximum number of GameServers to delete per reconcile loop
+	maxNumberOfGameServersToDelete int
 }
 
 // NewGameServerBuildReconciler returns a pointer to a new GameServerBuildReconciler
-func NewGameServerBuildReconciler(mgr manager.Manager, portRegistry *PortRegistry) *GameServerBuildReconciler {
+func NewGameServerBuildReconciler(mgr manager.Manager, portRegistry *PortRegistry, maxGsToAdd, maxGsToDelete int) *GameServerBuildReconciler {
 	cl := mgr.GetClient()
 	return &GameServerBuildReconciler{
-		Client:       cl,
-		Scheme:       mgr.GetScheme(),
-		PortRegistry: portRegistry,
-		Recorder:     mgr.GetEventRecorderFor("GameServerBuild"),
-		expectations: NewGameServerExpectations(cl),
+		Client:                         cl,
+		Scheme:                         mgr.GetScheme(),
+		PortRegistry:                   portRegistry,
+		Recorder:                       mgr.GetEventRecorderFor("GameServerBuild"),
+		expectations:                   NewGameServerExpectations(cl),
+		maxNumberOfGameServersToAdd:    maxGsToAdd,
+		maxNumberOfGameServersToDelete: maxGsToDelete,
 	}
 }
 
@@ -187,12 +186,12 @@ func (r *GameServerBuildReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	var totalNumberOfGameServersToDelete int = 0
 	// user has decreased standingBy numbers
 	if nonActiveGameServersCount > gsb.Spec.StandingBy {
-		totalNumberOfGameServersToDelete += int(math.Min(float64(nonActiveGameServersCount-gsb.Spec.StandingBy), maxNumberOfGameServersToDelete))
+		totalNumberOfGameServersToDelete += int(math.Min(float64(nonActiveGameServersCount-gsb.Spec.StandingBy), float64(r.maxNumberOfGameServersToDelete)))
 	}
 	// we also need to check if we are above the max
 	// this can happen if the user modifies the spec.Max during the GameServerBuild's lifetime
 	if nonActiveGameServersCount+activeCount > gsb.Spec.Max {
-		totalNumberOfGameServersToDelete += int(math.Min(float64(totalNumberOfGameServersToDelete+(nonActiveGameServersCount+activeCount-gsb.Spec.Max)), maxNumberOfGameServersToDelete))
+		totalNumberOfGameServersToDelete += int(math.Min(float64(totalNumberOfGameServersToDelete+(nonActiveGameServersCount+activeCount-gsb.Spec.Max)), float64(r.maxNumberOfGameServersToDelete)))
 	}
 	if totalNumberOfGameServersToDelete > 0 {
 		err := r.deleteNonActiveGameServers(ctx, &gsb, &gameServers, totalNumberOfGameServersToDelete)
@@ -205,12 +204,12 @@ func (r *GameServerBuildReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	// we're also limiting the number of game servers that are created to avoid issues like this https://github.com/kubernetes-sigs/controller-runtime/issues/1782
 	// we attempt to create the missing number of game servers, but we don't want to create more than the max
 	// an error channel for the go routines to write errors
-	errCh := make(chan error, maxNumberOfGameServersToAdd)
+	errCh := make(chan error, r.maxNumberOfGameServersToAdd)
 	// a waitgroup for async create calls
 	var wg sync.WaitGroup
 	for i := 0; i < gsb.Spec.StandingBy-nonActiveGameServersCount &&
 		i+nonActiveGameServersCount+activeCount < gsb.Spec.Max &&
-		i < maxNumberOfGameServersToAdd; i++ {
+		i < r.maxNumberOfGameServersToAdd; i++ {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()

pkg/operator/controllers/suite_test.go

@@ -37,9 +37,11 @@ import (
 )
 
 const (
-	assertPollingInterval = 20 * time.Millisecond
-	assertTimeout         = 2 * time.Second
-	allocationApiSvcPort  = 5000
+	assertPollingInterval          = 20 * time.Millisecond
+	assertTimeout                  = 2 * time.Second
+	allocationApiSvcPort           = 5000
+	maxNumberOfGameServersToAdd    = 20
+	maxNumberOfGameServersToDelete = 20
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -98,7 +100,7 @@ var _ = BeforeSuite(func() {
 	err = portRegistry.SetupWithManager(k8sManager)
 	Expect(err).ToNot(HaveOccurred())
 
-	err = (NewGameServerBuildReconciler(k8sManager, portRegistry)).SetupWithManager(k8sManager)
+	err = (NewGameServerBuildReconciler(k8sManager, portRegistry, maxNumberOfGameServersToAdd, maxNumberOfGameServersToDelete)).SetupWithManager(k8sManager)
 	Expect(err).ToNot(HaveOccurred())
 
 	initContainerImageLinux, initContainerImageWin := "testImageLinux", "testImageWin"

pkg/operator/main.go

@@ -63,6 +63,8 @@ type Config struct {
 	AllocationApiSvcPort                   int32  `env:"ALLOC_API_SVC_PORT" envDefault:"5000"`
 	InitContainerImageLinux                string `env:"THUNDERNETES_INIT_CONTAINER_IMAGE,notEmpty"`
 	InitContainerImageWin                  string `env:"THUNDERNETES_INIT_CONTAINER_IMAGE_WIN,notEmpty"`
+	MaxNumberOfGameServersToAdd            int32  `env:"MAX_NUM_GS_TO_ADD" envDefault:"20"`
+	MaxNumberOfGameServersToDelete         int32  `env:"MAX_NUM_GS_TO_DEL" envDefault:"20"`
 }
 
 var (
@@ -151,7 +153,7 @@ func main() {
 	}
 
 	// initialize the GameServerBuild controller
-	if err = controllers.NewGameServerBuildReconciler(mgr, portRegistry).SetupWithManager(mgr); err != nil {
+	if err = controllers.NewGameServerBuildReconciler(mgr, portRegistry, int(cfg.MaxNumberOfGameServersToAdd), int(cfg.MaxNumberOfGameServersToDelete)).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "GameServerBuild")
 		os.Exit(1)
 	}