Merge branch 'kubernetes-sigs:master' into patch-1

kubernetes-sigs · May 8, 2024 · f4b7d5e · f4b7d5e
2 parents d1b3555 + 90089b6
commit f4b7d5e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/charts/external-dns/CHANGELOG.md b/charts/external-dns/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Added
 
+- Added support for `extraContainers` argument. ([#4432](https://github.com/kubernetes-sigs/external-dns/pull/4432))[@omerap12](https://github.com/omerap12)
 - Added support for setting `excludeDomains` argument.  ([#4380](https://github.com/kubernetes-sigs/external-dns/pull/4380))[@bford-evs](https://github.com/bford-evs)
 
 ## [v1.14.4] - 2023-04-03

diff --git a/charts/external-dns/README.md b/charts/external-dns/README.md
@@ -101,6 +101,7 @@ If `namespaced` is set to `true`, please ensure that `sources` my only contains
 | env | list | `[]` | [Environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/) for the `external-dns` container. |
 | excludeDomains | list | `[]` |  |
 | extraArgs | list | `[]` | Extra arguments to provide to _ExternalDNS_. |
+| extraContainers | object | `{}` | Extra containers to add to the `Deployment`. |
 | extraVolumeMounts | list | `[]` | Extra [volume mounts](https://kubernetes.io/docs/concepts/storage/volumes/) for the `external-dns` container. |
 | extraVolumes | list | `[]` | Extra [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) for the `Pod`. |
 | fullnameOverride | string | `nil` | Override the full name of the chart. |

diff --git a/charts/external-dns/templates/deployment.yaml b/charts/external-dns/templates/deployment.yaml
@@ -70,6 +70,9 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
+      {{- with .Values.extraContainers }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
         - name: external-dns
           {{- with .Values.securityContext }}
           securityContext:

diff --git a/charts/external-dns/values.yaml b/charts/external-dns/values.yaml
@@ -53,6 +53,9 @@ rbac:
 # -- Annotations to add to the `Deployment`.
 deploymentAnnotations: {}
 
+# -- Extra containers to add to the `Deployment`.
+extraContainers: {}
+
 # -- [Deployment Strategy](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy).
 deploymentStrategy:
   type: Recreate

diff --git a/provider/aws/aws.go b/provider/aws/aws.go
@@ -69,6 +69,7 @@ var canonicalHostedZones = map[string]string{
 	"us-west-1.elb.amazonaws.com":         "Z368ELLRRE2KJ0",
 	"us-west-2.elb.amazonaws.com":         "Z1H1FL5HABSF5",
 	"ca-central-1.elb.amazonaws.com":      "ZQSVJUPU6J1EY",
+	"ca-west-1.elb.amazonaws.com":         "Z06473681N0SF6OS049SD",
 	"ap-east-1.elb.amazonaws.com":         "Z3DQVH9N71FHZ0",
 	"ap-south-1.elb.amazonaws.com":        "ZP97RAFLXTNZK",
 	"ap-south-2.elb.amazonaws.com":        "Z0173938T07WNTVAEPZN",
@@ -102,6 +103,7 @@ var canonicalHostedZones = map[string]string{
 	"elb.us-west-1.amazonaws.com":         "Z24FKFUX50B4VW",
 	"elb.us-west-2.amazonaws.com":         "Z18D5FSROUN65G",
 	"elb.ca-central-1.amazonaws.com":      "Z2EPGBW3API2WT",
+	"elb.ca-west-1.amazonaws.com":         "Z02754302KBB00W2LKWZ9",
 	"elb.ap-east-1.amazonaws.com":         "Z12Y7K3UBGUAD1",
 	"elb.ap-south-1.amazonaws.com":        "ZVDDRBQ08TROA",
 	"elb.ap-south-2.amazonaws.com":        "Z0711778386UTO08407HT",