feat: add nodeselector to pod overrides

BridgeSplash · May 23, 2023 · 123f169 · 123f169
1 parent 5be979c
commit 123f169
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 0 deletions.
diff --git a/kube/resources/crd/bases/shulkermc.io_minecraftserverfleets.yaml b/kube/resources/crd/bases/shulkermc.io_minecraftserverfleets.yaml
@@ -1395,6 +1395,11 @@ spec:
                                 - IfNotPresent
                                 type: string
                             type: object
+                          nodeSelector:
+                            additionalProperties:
+                              type: string
+                            description: Node selector to be applied on created Pod.
+                            type: object
                           resources:
                             description: The desired compute resource requirements
                               of the created Pod.

diff --git a/kube/resources/crd/bases/shulkermc.io_minecraftservers.yaml b/kube/resources/crd/bases/shulkermc.io_minecraftservers.yaml
@@ -1254,6 +1254,11 @@ spec:
                         - IfNotPresent
                         type: string
                     type: object
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    description: Node selector to be applied on created Pod.
+                    type: object
                   resources:
                     description: The desired compute resource requirements of the
                       created Pod.

diff --git a/kube/resources/crd/bases/shulkermc.io_proxyfleets.yaml b/kube/resources/crd/bases/shulkermc.io_proxyfleets.yaml
@@ -1205,6 +1205,11 @@ spec:
                         - IfNotPresent
                         type: string
                     type: object
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    description: Node selector to be applied on created Pod.
+                    type: object
                   resources:
                     description: The desired compute resource requirements of the
                       created Pod.

diff --git a/packages/shulker-crds/v1alpha1/mincraftserver_types.go b/packages/shulker-crds/v1alpha1/mincraftserver_types.go
@@ -132,6 +132,9 @@ type MinecraftServerPodOverridesSpec struct {
 	//+optional
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`
 
+	// Node selector to be applied on created Pod.
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+
 	// Tolerations to be applied on created Pod.
 	Tolarations []corev1.Toleration `json:"tolerations,omitempty"`
 

diff --git a/packages/shulker-crds/v1alpha1/proxyfleet_types.go b/packages/shulker-crds/v1alpha1/proxyfleet_types.go
@@ -135,6 +135,9 @@ type ProxyFleetPodOverridesSpec struct {
 	// Affinity scheduling rules to be applied on created Pod.
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`
 
+	// Node selector to be applied on created Pod.
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+
 	// Tolerations to be applied on created Pod.
 	Tolarations []corev1.Toleration `json:"tolerations,omitempty"`
 

diff --git a/packages/shulker-crds/v1alpha1/zz_generated.deepcopy.go b/packages/shulker-crds/v1alpha1/zz_generated.deepcopy.go
diff --git a/packages/shulker-operator/src/resources/minecraftserver/gameserver.go b/packages/shulker-operator/src/resources/minecraftserver/gameserver.go
@@ -184,6 +184,7 @@ func (b *MinecraftServerResourceGameServerBuilder) GetGameServerSpec() (*agonesv
 			podSpec.Affinity = b.Instance.Spec.PodOverrides.Affinity
 		}
 
+		podSpec.NodeSelector = b.Instance.Spec.PodOverrides.NodeSelector
 		podSpec.Tolerations = b.Instance.Spec.PodOverrides.Tolarations
 	}
 

diff --git a/packages/shulker-operator/src/resources/proxyfleet/fleet.go b/packages/shulker-operator/src/resources/proxyfleet/fleet.go
@@ -224,6 +224,7 @@ func (b *ProxyFleetResourceFleetBuilder) getGameServerSpec() (*agonesv1.GameServ
 			podSpec.Affinity = b.Instance.Spec.PodOverrides.Affinity
 		}
 
+		podSpec.NodeSelector = b.Instance.Spec.PodOverrides.NodeSelector
 		podSpec.Tolerations = b.Instance.Spec.PodOverrides.Tolarations
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     			podSpec.Affinity = b.Instance.Spec.PodOverrides.Affinity
     		}
+    		podSpec.NodeSelector = b.Instance.Spec.PodOverrides.NodeSelector
     		podSpec.Tolerations = b.Instance.Spec.PodOverrides.Tolarations
     	}
@@ Expand Down @@