Fix annotations on allocationApiService, validatingWebhook, mutatingWebhook (googleforgames#2528)

* Release v1.22.0 rc (googleforgames#2519) * release v1.22.0-rc * Re-generated Install.yaml * Changes on new release.md file * Update site/content/en/blog/releases/1.22.0-rc Co-authored-by: Mark Mandel <[email protected]> * Changes * updated and renamed the md file * regenerated changelog file * changes for md and changelog files Co-authored-by: Mark Mandel <[email protected]> * Fix annotations * Fix documentations * Add custom secret * Update documentations * minor Co-authored-by: SaitejaTamma <[email protected]> Co-authored-by: Mark Mandel <[email protected]>

Author: 3 people

install/helm/agones/templates/controller.yaml

@@ -159,6 +159,10 @@ spec:
  - name: certs
 secret:
 secretName: {{template "agones.fullname" . }}-cert
+{{- if .Values.agones.controller.customCertSecretPath }}
+items:
+{{- toYaml .Values.agones.controller.customCertSecretPath | nindent 10 }}
+{{- end }}
 {{- if .Values.agones.controller.persistentLogs }}
  - name: logs
 emptyDir: {}

install/helm/agones/templates/extensions.yaml

@@ -30,7 +30,7 @@ metadata:
 heritage: {{.Release.Service }}
 {{- if .Values.agones.controller.allocationApiService.annotations }}
 annotations:
-{{- toYaml .Values.agones.controller.allocationApiService.annotations | indent 4 }}
+{{- toYaml .Values.agones.controller.allocationApiService.annotations | nindent 4 }}
 {{- end }}
 spec:
 group: allocation.agones.dev
@@ -56,7 +56,7 @@ metadata:
 name: agones-validation-webhook
 {{- if .Values.agones.controller.validatingWebhook.annotations }}
 annotations:
-{{- toYaml .Values.agones.controller.validatingWebhook.annotations | indent 4 }}
+{{- toYaml .Values.agones.controller.validatingWebhook.annotations | nindent 4 }}
 {{- end }}
 labels:
 component: controller
@@ -119,7 +119,7 @@ metadata:
 name: agones-mutation-webhook
 {{- if .Values.agones.controller.mutatingWebhook.annotations }}
 annotations:
-{{- toYaml .Values.agones.controller.mutatingWebhook.annotations | indent 4 }}
+{{- toYaml .Values.agones.controller.mutatingWebhook.annotations | nindent 4 }}
 {{- end }}
 labels:
 component: controller

install/helm/agones/values.yaml

@@ -77,6 +77,7 @@ agones:
 mutatingWebhook:
 annotations: {}
 disableCaBundle: false
+customCertSecretPath: {}
 safeToEvict: false
 persistentLogs: true
 persistentLogsSizeLimitMB: 10000

site/content/en/docs/Installation/Install Agones/helm.md

@@ -210,6 +210,7 @@ The following tables lists the configurable parameters of the Agones chart and t
 | --------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ---------------------- |
 ||||
 |`agones.controller.disableSecret`| Disables the creation of any allocator secrets. If true, you MUST provide the `{agones.releaseName}-cert` secrets before installation. |`false`|
+|`agones.controller.customCertSecretPath`| Remap cert-manager path to server.crt and server.key |`{}`|
 |`agones.controller.allocationApiService.annotations`|[Annotations][annotations] added to the Agones apiregistration |`{}`|
 |`agones.controller.allocationApiService.disableCaBundle`| Disable ca-bundle so it can be injected by cert-manager |`false`|
 |`agones.controller.validatingWebhook.annotations`|[Annotations][annotations] added to the Agones validating webhook |`{}`|
@@ -324,7 +325,7 @@ metadata:
  name: my-release-cert
  namespace: agones-system
 spec:
-ipAddresses:
+dnsNames:
  - agones-controller-service.agones-system.svc
  secretName: my-release-cert
  issuerRef:
@@ -338,6 +339,9 @@ After the certificates are generated, we will want to [inject caBundle](https://
 ```bash
 helm install my-release \
  --set agones.controller.disableSecret=true \
+ --set agones.controller.customCertSecretPath[0].key='ca.crt',customCertSecretPath[0].path='ca.crt'
+ --set agones.controller.customCertSecretPath[1].key='tls.crt',customCertSecretPath[1].path='server.crt'
+ --set agones.controller.customCertSecretPath[2].key='tls.key',customCertSecretPath[2].path='server.key'
  --set agones.controller.allocationApiService.annotations={'cert-manager.io/inject-ca-from': 'agones-system/my-release-cert'} \
  --set agones.controller.allocationApiService.disableCaBundle=true \
  --set agones.controller.validatingWebhook.annotations={'cert-manager.io/inject-ca-from': 'agones-system/my-release-cert'} \