Change the config field name (#3226)

googleforgames · Jun 21, 2023 · 6d8923e · 6d8923e
1 parent e6186c4
commit 6d8923e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/install/helm/agones/templates/controller.yaml b/install/helm/agones/templates/controller.yaml
@@ -66,15 +66,15 @@ spec:
     spec:
       affinity:
       {{- if .Values.agones.controller.affinity }}
-      {{- if .Values.agones.system.requireDedicatedNode }}
-      {{- fail "agones.controller.affinity and agones.system.requireDedicatedNode cannot be set at the same time!" }}
+      {{- if .Values.agones.requireDedicatedNodes }}
+      {{- fail "agones.controller.affinity and agones.requireDedicatedNodes cannot be set at the same time!" }}
       {{- end}}
       {{- end}}
       {{- if .Values.agones.controller.affinity }}
 {{ toYaml .Values.agones.controller.affinity | indent 8 }}
       {{- else}}
         nodeAffinity:
-          {{- if .Values.agones.system.requireDedicatedNode }}
+          {{- if .Values.agones.requireDedicatedNodes }}
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:

diff --git a/install/helm/agones/templates/extensions-deployment.yaml b/install/helm/agones/templates/extensions-deployment.yaml
@@ -57,15 +57,15 @@ spec:
     spec:
       affinity:
       {{- if .Values.agones.extensions.affinity }}
-      {{- if .Values.agones.system.requireDedicatedNode }}
-      {{- fail "agones.extensions.affinity and agones.system.requireDedicatedNode cannot be set at the same time!" }}
+      {{- if .Values.agones.requireDedicatedNodes }}
+      {{- fail "agones.extensions.affinity and agones.requireDedicatedNodes cannot be set at the same time!" }}
       {{- end}}
       {{- end}}
       {{- if .Values.agones.extensions.affinity }}
 {{ toYaml .Values.agones.extensions.affinity | indent 8 }}
       {{- else}}
         nodeAffinity:
-          {{- if .Values.agones.system.requireDedicatedNode }}
+          {{- if .Values.agones.requireDedicatedNodes }}
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:

diff --git a/install/helm/agones/templates/ping.yaml b/install/helm/agones/templates/ping.yaml
@@ -50,15 +50,15 @@ spec:
     spec:
       affinity:
       {{- if .Values.agones.ping.affinity }}
-      {{- if .Values.agones.system.requireDedicatedNode }}
-      {{- fail "agones.ping.affinity and agones.system.requireDedicatedNode cannot be set at the same time!" }}
+      {{- if .Values.agones.requireDedicatedNodes }}
+      {{- fail "agones.ping.affinity and agones.requireDedicatedNodes cannot be set at the same time!" }}
       {{- end}}
       {{- end}}
       {{- if .Values.agones.ping.affinity }}
 {{ toYaml .Values.agones.ping.affinity | indent 8 }}
       {{- else}}
         nodeAffinity:
-          {{- if .Values.agones.system.requireDedicatedNode }}
+          {{- if .Values.agones.requireDedicatedNodes }}
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:

diff --git a/install/helm/agones/templates/service/allocation.yaml b/install/helm/agones/templates/service/allocation.yaml
@@ -167,15 +167,15 @@ spec:
     spec:
       affinity:
       {{- if .Values.agones.allocator.affinity }}
-      {{- if .Values.agones.system.requireDedicatedNode }}
-      {{- fail "agones.allocator.affinity and agones.system.requireDedicatedNode cannot be set at the same time!" }}
+      {{- if .Values.agones.requireDedicatedNodes }}
+      {{- fail "agones.allocator.affinity and agones.requireDedicatedNodes cannot be set at the same time!" }}
       {{- end}}
       {{- end}}
       {{- if .Values.agones.allocator.affinity }}
 {{ toYaml .Values.agones.allocator.affinity | indent 8 }}
       {{- else}}
         nodeAffinity:
-          {{- if .Values.agones.system.requireDedicatedNode }}
+          {{- if .Values.agones.requireDedicatedNodes }}
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:

diff --git a/install/helm/agones/values.yaml b/install/helm/agones/values.yaml
@@ -46,8 +46,7 @@ agones:
   createPriorityClass: true
   priorityClassName: agones-system
   cloudProduct: "auto"
-  system:
-    requireDedicatedNode: false
+  requireDedicatedNodes: false
   controller:
     resources: {}
       # requests:

diff --git a/site/content/en/docs/Installation/Install Agones/helm.md b/site/content/en/docs/Installation/Install Agones/helm.md
@@ -105,7 +105,7 @@ The following tables lists the configurable parameters of the Agones chart and t
 | `agones.registerServiceAccounts`     | Attempts to create service accounts for the controllers                                                                                                                                                                 | `true`          |
 | `agones.createPriorityClass`         | Attempts to create priority classes for the controllers                                                                                                                                                                 | `true`          |
 | `agones.priorityClassName`           | Name of the priority classes to create                                                                                                                                                                                  | `agones-system` |
-| `agones.system.requireDedicatedNode` | Forces Agones system components to be scheduled on dedicated nodes, only applies to the GKE Standard without node auto-provisioning                                                                                     | `false`         |
+| `agones.requireDedicatedNodes` | Forces Agones system components to be scheduled on dedicated nodes, only applies to the GKE Standard without node auto-provisioning                                                                                     | `false`         |
 
 {{% /feature %}}