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

Helm Param Update: Default to agones.controller if agones.extensions is Missing #3773

Merged
merged 13 commits into from
May 2, 2024
Merged

Helm Param Update: Default to agones.controller if agones.extensions is Missing #3773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
33ddbcf
Helm Parameter Migration to agones.extensions
Kalaiselvi84 Apr 17, 2024
6629563
Revert "Helm Parameter Migration to agones.extensions"
Kalaiselvi84 Apr 17, 2024
2f3ed0d
apply default function to necessary .Values.agones.controller
Kalaiselvi84 Apr 17, 2024
af2cb5b
modify helm.md to reflect the changes
Kalaiselvi84 Apr 17, 2024
7d9caf7
Merge branch 'main' into ac-to-ae
Kalaiselvi84 Apr 17, 2024
856975a
default to agones.controller.pdb.maxUnavailable if agones.extensions.…
Kalaiselvi84 Apr 19, 2024
4006c3f
Revert "default to agones.controller.pdb.maxUnavailable if agones.ext…
Kalaiselvi84 Apr 19, 2024
160ca6c
revert default for maxUnavailable and fix punctuation
Kalaiselvi84 Apr 19, 2024
34f0d64
Merge branch 'main' into ac-to-ae
Kalaiselvi84 Apr 19, 2024
d529654
Merge branch 'main' into ac-to-ae
zmerlynn Apr 23, 2024
68a1ade
feature shortcode, deprecated info in controller, and cleaned up exte…
Kalaiselvi84 Apr 25, 2024
2a78148
Merge branch 'main' into ac-to-ae
zmerlynn Apr 25, 2024
c622180
Merge branch 'main' into ac-to-ae
zmerlynn May 1, 2024
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
20 changes: 11 additions & 9 deletions install/helm/agones/templates/extensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ metadata:
chart: {{ template "agones.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- if .Values.agones.controller.allocationApiService.annotations }}
{{- $annotations := default .Values.agones.controller.allocationApiService.annotations .Values.agones.extensions.allocationApiService.annotations }}
{{- if $annotations }}
annotations:
{{- toYaml .Values.agones.controller.allocationApiService.annotations | nindent 4 }}
{{- toYaml $annotations | nindent 4 }}
{{- end }}
spec:
group: allocation.agones.dev
Expand All @@ -39,7 +40,7 @@ spec:
service:
name: agones-controller-service
namespace: {{ .Release.Namespace }}
{{- if not .Values.agones.controller.allocationApiService.disableCaBundle }}
{{- if not (default .Values.agones.controller.allocationApiService.disableCaBundle .Values.agones.extensions.allocationApiService.disableCaBundle) }}
{{- if .Values.agones.controller.generateTLS }}
caBundle: {{ b64enc $ca.Cert }}
{{- else }}
Expand All @@ -54,7 +55,7 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
name: agones-validation-webhook
{{- if .Values.agones.controller.validatingWebhook.annotations }}
{{- if (default .Values.agones.controller.validatingWebhook.annotations .Values.agones.extensions.validatingWebhook.annotations) }}
annotations:
{{- toYaml .Values.agones.controller.validatingWebhook.annotations | nindent 4 }}
{{- end }}
Expand All @@ -75,7 +76,7 @@ webhooks:
name: agones-controller-service
namespace: {{ .Release.Namespace }}
path: /validate
{{- if not .Values.agones.controller.validatingWebhook.disableCaBundle }}
{{- if not (default .Values.agones.controller.validatingWebhook.disableCaBundle .Values.agones.extensions.validatingWebhook.disableCaBundle) }}
{{- if .Values.agones.controller.generateTLS }}
caBundle: {{ b64enc $ca.Cert }}
{{- else }}
Expand Down Expand Up @@ -117,9 +118,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
metadata:
name: agones-mutation-webhook
{{- if .Values.agones.controller.mutatingWebhook.annotations }}
{{- $annotations := default .Values.agones.controller.mutatingWebhook.annotations .Values.agones.extensions.mutatingWebhook.annotations }}
{{- if $annotations }}
annotations:
{{- toYaml .Values.agones.controller.mutatingWebhook.annotations | nindent 4 }}
{{- toYaml $annotations | nindent 4 }}
{{- end }}
labels:
component: controller
Expand All @@ -138,7 +140,7 @@ webhooks:
name: agones-controller-service
namespace: {{ .Release.Namespace }}
path: /mutate
{{- if not .Values.agones.controller.mutatingWebhook.disableCaBundle }}
{{- if not (default .Values.agones.controller.mutatingWebhook.disableCaBundle .Values.agones.extensions.mutatingWebhook.disableCaBundle) }}
{{- if .Values.agones.controller.generateTLS }}
caBundle: {{ b64enc $ca.Cert }}
{{- else }}
Expand All @@ -165,7 +167,7 @@ webhooks:
- CREATE
- UPDATE
{{- end }}
{{- if not .Values.agones.controller.disableSecret }}
{{- if not (default .Values.agones.controller.disableSecret .Values.agones.extensions.disableSecret) }}
---
apiVersion: v1
kind: Secret
Expand Down
Loading
Loading