Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions install/helm/agones/templates/crds/_gameserverspecschema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,12 @@ properties:
title: Max capacity of the array (can be less than or equal to value of maxItems)
minimum: 0
default: 1000
maximum: 1000 # must be equal to values.maxItems
maximum: {{ .lists.maxItems }} # must be equal to values.maxItems
values:
title: set of all the items in the list
type: array
x-kubernetes-list-type: set # Requires items in the array to be unique
maxItems: 1000 # max possible size of the value array (cannot be updated)
maxItems: {{ .lists.maxItems }} # max possible size of the value array (cannot be updated)
items: # name of the item (player1, session1, room1, etc.)
type: string
default: []
Expand Down
4 changes: 2 additions & 2 deletions install/helm/agones/templates/crds/_gameserverstatus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ status:
type: integer
minimum: 0
default: 1000
maximum: 1000 # must be equal to values.maxItems
maximum: {{ .lists.maxItems }} # must be equal to values.maxItems
values:
title: Set of all the items in the list
type: array
x-kubernetes-list-type: set # Requires items in the array to be unique
maxItems: 1000 # max possible size of the value array (cannot be updated)
maxItems: {{ .lists.maxItems }} # max possible size of the value array (cannot be updated)
items: # name of the item (player1, session1, room1, etc.)
type: string
default: []
Expand Down
6 changes: 5 additions & 1 deletion install/helm/agones/templates/crds/fleet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ spec:
- Ascending
- Descending
template:
{{- $data := dict "metadata" true "podPreserveUnknownFields" .Values.gameservers.podPreserveUnknownFields }}
{{- $data := dict
"metadata" true
"podPreserveUnknownFields" .Values.gameservers.podPreserveUnknownFields
"lists" .Values.agones.crds.gameserver.lists
}}
{{- include "gameserver.schema" $data | indent 17 }}
status:
description: 'FleetStatus is the status of a Fleet. More info:
Expand Down
5 changes: 4 additions & 1 deletion install/helm/agones/templates/crds/gameserver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ spec:
type: date
schema:
openAPIV3Schema:
{{- $data := dict "podPreserveUnknownFields" .Values.gameservers.podPreserveUnknownFields }}
{{- $data := dict
"podPreserveUnknownFields" .Values.gameservers.podPreserveUnknownFields
"lists" .Values.agones.crds.gameserver.lists
}}
{{- include "gameserver.schema" $data | indent 9 }}{{- /* include the schema then status, as it's easier to align */ -}}
{{- include "gameserver.status" $data | indent 11 }}
subresources:
Expand Down
6 changes: 5 additions & 1 deletion install/helm/agones/templates/crds/gameserverset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,11 @@ spec:
- Ascending
- Descending
template:
{{- $data := dict "metadata" true "podPreserveUnknownFields" .Values.gameservers.podPreserveUnknownFields }}
{{- $data := dict
"metadata" true
"podPreserveUnknownFields" .Values.gameservers.podPreserveUnknownFields
"lists" .Values.agones.crds.gameserver.lists
}}
{{- include "gameserver.schema" $data | indent 18 }}
status:
description: 'GameServerSetStatus is the status of a GameServerSet. More info:
Expand Down
13 changes: 13 additions & 0 deletions install/helm/agones/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,19 @@
"cleanupJobTTL": {
"type": "integer",
"minimum": 0
},
"gameserver": {
"type": "object",
"properties": {
"lists": {
"type": "object",
"properties": {
"maxItems": {
"type": "integer"
}
}
}
}
}
},
"if": {
Expand Down
3 changes: 3 additions & 0 deletions install/helm/agones/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ agones:
install: true
cleanupOnDelete: true
cleanupJobTTL: 60
gameserver:
lists:
maxItems: 1000
serviceaccount:
allocator:
name: agones-allocator
Expand Down
18 changes: 9 additions & 9 deletions install/yaml/install.yaml
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is not related to my changes but this is how the new install.yaml file got regenerated

Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
---
# Source: agones/templates/priority-class.yaml
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: agones-system
value: 1000000
globalDefault: false
description: "This priority class should be used for Agones service pods only."
---
# Source: agones/templates/controller.yaml
apiVersion: policy/v1
kind: PodDisruptionBudget
Expand Down Expand Up @@ -19175,15 +19184,6 @@ webhooks:
operations:
- CREATE
---
# Source: agones/templates/priority-class.yaml
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: agones-system
value: 1000000
globalDefault: false
description: "This priority class should be used for Agones service pods only."
---
# Source: agones/templates/extensions.yaml
apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
Expand Down
11 changes: 6 additions & 5 deletions site/content/en/docs/Installation/Install Agones/helm.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,12 @@ The following tables lists the configurable parameters of the Agones chart and t

### Custom Resource Definitions

| Parameter | Description | Default |
| ----------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
| `agones.crds.install` | Install the CRDs with this chart. Useful to disable if you want to subchart (since crd-install hook is broken), so you can copy the CRDs into your own chart. | `true` |
| `agones.crds.cleanupOnDelete` | Run the pre-delete hook to delete all GameServers and their backing Pods when deleting the helm chart, so that all CRDs can be removed on chart deletion | `true` |
| `agones.crds.cleanupJobTTL` | The number of seconds for Kubernetes to delete the associated Job and Pods of the pre-delete hook after it completes, regardless if the Job is successful or not. Set to `0` to disable cleaning up the Job or the associated Pods. | `60` |
| Parameter | Description | Default |
| --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
| `agones.crds.install` | Install the CRDs with this chart. Useful to disable if you want to subchart (since crd-install hook is broken), so you can copy the CRDs into your own chart. | `true` |
| `agones.crds.cleanupOnDelete` | Run the pre-delete hook to delete all GameServers and their backing Pods when deleting the helm chart, so that all CRDs can be removed on chart deletion | `true` |
| `agones.crds.cleanupJobTTL` | The number of seconds for Kubernetes to delete the associated Job and Pods of the pre-delete hook after it completes, regardless if the Job is successful or not. Set to `0` to disable cleaning up the Job or the associated Pods. | `60` |
| `agones.crds.gameserver.lists.maxItems` | The maximum number of items that can be specified for a list. | `1000` |

### Metrics

Expand Down