Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add pod annotations #1849

Merged
merged 8 commits into from
Oct 21, 2020
+22 −2
Merged

Add pod annotations #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fcafc61
Changed to allow annotations to be injected (#1848)
8398a7 Oct 16, 2020
3fd9c4c
Docs: Added explanation of annotations (#1848)
8398a7 Oct 16, 2020
87e4ef1
Changed to allow annotations to be injected (#1848)
8398a7 Oct 17, 2020
ab93fd6
Docs: Fixed docs related to annotations (#1848)
8398a7 Oct 17, 2020
b707bb0
Fixed the annotation link (#1848)
8398a7 Oct 17, 2020
9b70197
Docs: Improve the description (#1848)
8398a7 Oct 20, 2020
6890160
Docs: Move the annotation from feature (#1848)
8398a7 Oct 20, 2020
05a97c6
Merge branch 'master' into addPodAnnotations
markmandel Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions install/helm/agones/templates/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ spec:
prometheus.io/scrape: "true"
prometheus.io/port: {{ .Values.agones.controller.http.port | quote }}
prometheus.io/path: "/metrics"
{{- end }}
{{- if .Values.agones.controller.annotations }}
{{- toYaml .Values.agones.controller.annotations | nindent 8 }}
{{- end }}
labels:
agones.dev/role: controller
Expand Down
6 changes: 5 additions & 1 deletion install/helm/agones/templates/ping.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ spec:
app: {{ template "agones.name" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.agones.ping.annotations }}
annotations:
{{- toYaml .Values.agones.ping.annotations | nindent 8 }}
{{- end }}
spec:
{{- if .Values.agones.ping.affinity }}
affinity:
Expand Down Expand Up @@ -156,4 +160,4 @@ spec:
{{- end }}
{{- end }}

{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions install/helm/agones/templates/service/allocation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ spec:
prometheus.io/scrape: "true"
prometheus.io/port: "8080"
prometheus.io/path: "/metrics"
{{- end }}
{{- if .Values.agones.allocator.annotations }}
{{- toYaml .Values.agones.allocator.annotations | nindent 8 }}
{{- end }}
spec:
{{- if .Values.agones.allocator.affinity }}
Expand Down
3 changes: 3 additions & 0 deletions install/helm/agones/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ agones:
controller:
resources: {}
nodeSelector: {}
annotations: {}
tolerations:
- key: "agones.dev/agones-system"
operator: "Equal"
Expand Down Expand Up @@ -69,6 +70,7 @@ agones:
install: true
resources: {}
nodeSelector: {}
annotations: {}
tolerations:
- key: "agones.dev/agones-system"
operator: "Equal"
Expand Down Expand Up @@ -106,6 +108,7 @@ agones:
timeoutSeconds: 1
allocator:
install: true
annotations: {}
healthCheck:
initialDelaySeconds: 3
periodSeconds: 3
Expand Down
9 changes: 8 additions & 1 deletion site/content/en/docs/Installation/Install Agones/helm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,14 @@ The following tables lists the configurable parameters of the Agones chart and t
| `agones.ping.http.serviceType` | The [Service Type][service] of the HTTP Service | `LoadBalancer` |
| `agones.ping.http.loadBalancerIP` | The [Load Balancer IP][loadBalancer] of the HTTP Service load balancer. Only works if the Kubernetes provider supports this option. | \`\` |
| `agones.ping.http.loadBalancerSourceRanges` | The [Load Balancer SourceRanges][loadBalancer] of the HTTP Service load balancer. Only works if the Kubernetes provider supports this option. | `[]` |
| `agones.ping.http.annotations` | [Annotations][annotations] added to the Agones ping http service | `{}` |
| `agones.ping.udp.expose` | Expose the udp ping service via a Service | `true` |
| `agones.ping.udp.rateLimit` | Number of UDP packets the ping service handles per instance, per second, per sender | `20` |
| `agones.ping.udp.port` | The port to expose on the service | `80` |
| `agones.ping.udp.serviceType` | The [Service Type][service] of the UDP Service | `LoadBalancer` |
| `agones.ping.udp.loadBalancerIP` | The [Load Balancer IP][loadBalancer] of the UDP Service load balancer. Only works if the Kubernetes provider supports this option. | \`\` |
| `agones.ping.udp.loadBalancerSourceRanges` | The [Load Balancer SourceRanges][loadBalancer] of the UDP Service load balancer. Only works if the Kubernetes provider supports this option. | `[]` |
| `agones.ping.udp.annotations` | [Annotations][annotations] added to the Agones ping udp service | `{}` |
| `agones.ping.healthCheck.initialDelaySeconds` | Initial delay before performing the first probe (in seconds) | `3` |
| `agones.ping.healthCheck.periodSeconds` | Seconds between every liveness probe (in seconds) | `3` |
| `agones.ping.healthCheck.failureThreshold` | Number of times before giving up (in seconds) | `3` |
Expand Down Expand Up @@ -238,7 +240,10 @@ The following tables lists the configurable parameters of the Agones chart and t
| --------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ---------------------- |
| `agones.allocator.allocationTimeout` | Remote allocation call timeout. | `10s` |
| `agones.allocator.remoteAllocationTimeout` | Total remote allocation timeout including retries. | `30s` |

| `agones.controller.annotations` | [Annotations][annotations] added to the Agones controller pods | `{}` |
| `agones.allocator.annotations` | [Annotations][annotations] added to the Agones allocator pods | `{}` |
| `agones.ping.annotations` | [Annotations][annotations] added to the Agones ping pods | `{}` |
| | | |
{{% /feature %}}

[toleration]: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
Expand All @@ -250,6 +255,8 @@ The following tables lists the configurable parameters of the Agones chart and t
[service]: https://kubernetes.io/docs/concepts/services-networking/service/
[allocator]: {{< ref "/docs/advanced/allocator-service.md" >}}
[loadBalancer]: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
[annotations]: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/


Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

Expand Down