Skip to content

Commit dafa734

Browse files
malpoumalpou
authored
Merge branch 'kubernetes-sigs:master' into feat/txt-registry-new-format-only
2 parents 5a849a7 + 36478f1 commit dafa734

14 files changed

+314
-151
lines changed

‎charts/external-dns/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2727

2828
- Fixed automatic addition of pod selector labels to `affinity` and `topologySpreadConstraints` if not defined. _@pvickery-ParamountCommerce_
2929

30+
### Changed
31+
32+
- Allow templating `serviceaccount.annotations` keys and values, by rendering them using the `tpl` built-in function. [#4958](https://github.com/kubernetes-sigs/external-dns/pull/4958) _@fcrespofastly_
33+
3034
## [v1.15.0] - 2023-09-10
3135

3236
### Changed

‎charts/external-dns/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ If `namespaced` is set to `true`, please ensure that `sources` my only contains
153153
| service.ipFamilies | list | `[]` | Service IP families. |
154154
| service.ipFamilyPolicy | string | `nil` | Service IP family policy. |
155155
| service.port | int | `7979` | Service HTTP port. |
156-
| serviceAccount.annotations | object | `{}` | Annotations to add to the service account. |
156+
| serviceAccount.annotations | object | `{}` | Annotations to add to the service account. Templates are allowed in both the key and the value. Example: `example.com/annotation/{{ .Values.nameOverride }}: {{ .Values.nameOverride }}` |
157157
| serviceAccount.automountServiceAccountToken | string | `nil` | Set this to `false` to [opt out of API credential automounting](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#opt-out-of-api-credential-automounting) for the `ServiceAccount`. |
158158
| serviceAccount.create | bool | `true` | If `true`, create a new `ServiceAccount`. |
159159
| serviceAccount.labels | object | `{}` | Labels to add to the service account. |

‎charts/external-dns/ci/ci-values.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,9 @@ topologySpreadConstraints:
3434
- maxSkew: 1
3535
topologyKey: "topology.kubernetes.io/zone"
3636
whenUnsatisfiable: "ScheduleAnyway"
37+
38+
serviceAccount:
39+
annotations:
40+
notTemplated/version: "v1.2.3"
41+
justValueTemplated/version: "{{ .Chart.Version }}"
42+
"{{ .Chart.Name }}/chart": "{{ .Chart.Version }}"

‎charts/external-dns/templates/serviceaccount.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ metadata:
1111
{{- end }}
1212
{{- with .Values.serviceAccount.annotations }}
1313
annotations:
14-
{{- toYaml . | nindent 4 }}
14+
{{- range $k, $v := . }}
15+
{{- printf "%s: %s" (tpl $k $) (tpl $v $) | nindent 4 }}
16+
{{- end }}
1517
{{- end }}
1618
automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
1719
{{- end }}

‎charts/external-dns/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ serviceAccount:
3131
create: true
3232
# -- Labels to add to the service account.
3333
labels: {}
34-
# -- Annotations to add to the service account.
34+
# -- Annotations to add to the service account. Templates are allowed in both the key and the value. Example: `example.com/annotation/{{ .Values.nameOverride }}: {{ .Values.nameOverride }}`
3535
annotations: {}
3636
# -- (string) If this is set and `serviceAccount.create` is `true` this will be used for the created `ServiceAccount` name, if set and `serviceAccount.create` is `false` then this will define an existing `ServiceAccount` to use.
3737
name:

‎go.mod

+39-39
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@ go 1.23.3
44

55
require (
66
cloud.google.com/go/compute/metadata v0.6.0
7-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
7+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
88
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
99
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns v1.2.0
1010
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0
1111
github.com/F5Networks/k8s-bigip-ctlr/v2 v2.18.1
1212
github.com/IBM-Cloud/ibm-cloud-cli-sdk v1.5.0
13-
github.com/IBM/go-sdk-core/v5 v5.18.3
13+
github.com/IBM/go-sdk-core/v5 v5.18.5
1414
github.com/IBM/networking-go-sdk v0.49.0
1515
github.com/Yamashou/gqlgenc v0.30.2
1616
github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2
1717
github.com/alecthomas/kingpin/v2 v2.4.0
18-
github.com/aliyun/alibaba-cloud-sdk-go v1.63.77
19-
github.com/aws/aws-sdk-go-v2 v1.32.7
20-
github.com/aws/aws-sdk-go-v2/config v1.28.7
21-
github.com/aws/aws-sdk-go-v2/credentials v1.17.48
22-
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.22
23-
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.38.1
24-
github.com/aws/aws-sdk-go-v2/service/route53 v1.46.4
25-
github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.34.1
26-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.3
18+
github.com/aliyun/alibaba-cloud-sdk-go v1.63.79
19+
github.com/aws/aws-sdk-go-v2 v1.32.8
20+
github.com/aws/aws-sdk-go-v2/config v1.28.9
21+
github.com/aws/aws-sdk-go-v2/credentials v1.17.50
22+
github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.15.25
23+
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.39.2
24+
github.com/aws/aws-sdk-go-v2/service/route53 v1.47.1
25+
github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.34.3
26+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.5
2727
github.com/bodgit/tsig v1.2.2
2828
github.com/cenkalti/backoff/v4 v4.3.0
29-
github.com/civo/civogo v0.3.90
29+
github.com/civo/civogo v0.3.91
3030
github.com/cloudflare/cloudflare-go v0.113.0
3131
github.com/cloudfoundry-community/go-cfclient v0.0.0-20190201205600-f136f9222381
3232
github.com/datawire/ambassador v1.12.4
@@ -41,7 +41,7 @@ require (
4141
github.com/google/uuid v1.6.0
4242
github.com/gophercloud/gophercloud v1.14.1
4343
github.com/linki/instrumented_http v0.3.0
44-
github.com/linode/linodego v1.44.0
44+
github.com/linode/linodego v1.44.1
4545
github.com/maxatome/go-testdeep v1.14.0
4646
github.com/miekg/dns v1.1.62
4747
github.com/onsi/ginkgo v1.16.5
@@ -57,18 +57,18 @@ require (
5757
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30
5858
github.com/sirupsen/logrus v1.9.3
5959
github.com/stretchr/testify v1.10.0
60-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1074
61-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1074
62-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.1074
60+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.1079
61+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.1079
62+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/privatedns v1.0.1079
6363
github.com/transip/gotransip/v6 v6.26.0
6464
github.com/ultradns/ultradns-sdk-go v1.3.7
6565
go.etcd.io/etcd/client/v3 v3.5.17
6666
go.uber.org/ratelimit v0.3.1
67-
golang.org/x/net v0.33.0
68-
golang.org/x/oauth2 v0.24.0
67+
golang.org/x/net v0.34.0
68+
golang.org/x/oauth2 v0.25.0
6969
golang.org/x/sync v0.10.0
70-
golang.org/x/time v0.8.0
71-
google.golang.org/api v0.214.0
70+
golang.org/x/time v0.9.0
71+
google.golang.org/api v0.216.0
7272
gopkg.in/ns1/ns1-go.v2 v2.13.0
7373
gopkg.in/yaml.v2 v2.4.0
7474
istio.io/api v1.24.2
@@ -91,16 +91,16 @@ require (
9191
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
9292
github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5 // indirect
9393
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
94-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 // indirect
95-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect
96-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect
94+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 // indirect
95+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
96+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
9797
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
98-
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.10 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.24.12 // indirect
9999
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
100-
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.7 // indirect
101-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 // indirect
102-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.8 // indirect
103-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7 // indirect
100+
github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.10.8 // indirect
101+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
102+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
103+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
104104
github.com/aws/smithy-go v1.22.1 // indirect
105105
github.com/benbjohnson/clock v1.3.0 // indirect
106106
github.com/beorn7/perks v1.0.1 // indirect
@@ -136,7 +136,7 @@ require (
136136
github.com/google/gofuzz v1.2.0 // indirect
137137
github.com/google/s2a-go v0.1.8 // indirect
138138
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
139-
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
139+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
140140
github.com/gopherjs/gopherjs v1.17.2 // indirect
141141
github.com/hashicorp/errwrap v1.1.0 // indirect
142142
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -189,22 +189,22 @@ require (
189189
go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
190190
go.mongodb.org/mongo-driver v1.14.0 // indirect
191191
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
192-
go.opentelemetry.io/otel v1.29.0 // indirect
193-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
194-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
192+
go.opentelemetry.io/otel v1.31.0 // indirect
193+
go.opentelemetry.io/otel/metric v1.31.0 // indirect
194+
go.opentelemetry.io/otel/trace v1.31.0 // indirect
195195
go.uber.org/atomic v1.10.0 // indirect
196196
go.uber.org/multierr v1.11.0 // indirect
197197
go.uber.org/zap v1.26.0 // indirect
198-
golang.org/x/crypto v0.31.0 // indirect
198+
golang.org/x/crypto v0.32.0 // indirect
199199
golang.org/x/mod v0.22.0 // indirect
200-
golang.org/x/sys v0.28.0 // indirect
201-
golang.org/x/term v0.27.0 // indirect
200+
golang.org/x/sys v0.29.0 // indirect
201+
golang.org/x/term v0.28.0 // indirect
202202
golang.org/x/text v0.21.0 // indirect
203203
golang.org/x/tools v0.28.0 // indirect
204-
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
205-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
206-
google.golang.org/grpc v1.67.1 // indirect
207-
google.golang.org/protobuf v1.35.2 // indirect
204+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
205+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
206+
google.golang.org/grpc v1.69.2 // indirect
207+
google.golang.org/protobuf v1.36.1 // indirect
208208
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
209209
gopkg.in/inf.v0 v0.9.1 // indirect
210210
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)