Merge remote-tracking branch 'origin/master' into ingress-class-filte…

…ring
kubernetes-sigs · Feb 14, 2022 · 1ceec80 · 1ceec80
2 parents 097df5c + 3b1db59
commit 1ceec80
Show file tree

Hide file tree

Showing 54 changed files with 1,975 additions and 469 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: ^1.16
+        go-version: ^1.17
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@
 
 # builder image
 ARG ARCH
-FROM golang:1.16 as builder
+FROM golang:1.17 as builder
 ARG ARCH
 
 WORKDIR /sigs.k8s.io/external-dns
@@ -27,7 +27,7 @@ COPY . .
 RUN make test build.$ARCH
 
 # final image
-FROM $ARCH/alpine:3.14
+FROM $ARCH/alpine:3.15
 
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /sigs.k8s.io/external-dns/build/external-dns /bin/external-dns

diff --git a/Dockerfile.mini b/Dockerfile.mini
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16 as builder
+FROM golang:1.17 as builder
 
 WORKDIR /sigs.k8s.io/external-dns
 

diff --git a/Makefile b/Makefile
@@ -105,7 +105,7 @@ build.push/multiarch:
 		image="$(IMAGE):$(VERSION)-$${arch}" ;\
 		# pre-pull due to https://github.com/kubernetes-sigs/cluster-addons/pull/84/files ;\
 		docker pull $${arch}/alpine:3.14 ;\
-		docker pull golang:1.16 ;\
+		docker pull golang:1.17 ;\
 		DOCKER_BUILDKIT=1 docker build --rm --tag $${image} --build-arg VERSION="$(VERSION)" --build-arg ARCH="$${arch}" . ;\
 		docker push $${image} ;\
 		arch_specific_tags+=( "--amend $${image}" ) ;\

diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ ExternalDNS' allows you to keep selected zones (via `--domain-filter`) synchroni
 * [Akamai Edge DNS](https://learn.akamai.com/en-us/products/cloud_security/edge_dns.html)
 * [GoDaddy](https://www.godaddy.com)
 * [Gandi](https://www.gandi.net)
+* [UKFast SafeDNS](https://my.ukfast.co.uk/safedns/)
 
 From this release, ExternalDNS can become aware of the records it is managing (enabled via `--registry=txt`), therefore ExternalDNS can safely manage non-empty hosted zones. We strongly encourage you to use `v0.5` (or greater) with `--registry=txt` enabled and `--txt-owner-id` set to a unique value that doesn't change for the lifetime of your cluster. You might also want to run ExternalDNS in a dry run mode (`--dry-run` flag) to see the changes to be submitted to your DNS Provider API.
 
@@ -109,13 +110,17 @@ The following table clarifies the current status of the providers according to t
 | UltraDNS | Alpha | |
 | GoDaddy | Alpha | |
 | Gandi | Alpha | @packi |
+| SafeDNS | Alpha | @assureddt |
 
 ## Kubernetes version compatibility
 
-| ExternalDNS        |      <= 0.9.x      |     >= 0.10.0      |
-| ------------------ | :----------------: | :----------------: |
-| Kubernetes <= 1.18 | :white_check_mark: |        :x:         |
-| Kubernetes >= 1.19 |        :x:         | :white_check_mark: |
+A [breaking change](https://github.com/kubernetes-sigs/external-dns/pull/2281) was added in external-dns v0.10.0. 
+
+| ExternalDNS                    |      <= 0.9.x      |     >= 0.10.0      |
+| ------------------------------ | :----------------: | :----------------: |
+| Kubernetes <= 1.18             | :white_check_mark: |        :x:         |
+| Kubernetes >= 1.19 and <= 1.21 | :white_check_mark: | :white_check_mark: |
+| Kubernetes >= 1.22             |        :x:         | :white_check_mark: |
 
 ## Running ExternalDNS:
 
@@ -128,6 +133,7 @@ The are two ways of running ExternalDNS:
 
 The following tutorials are provided:
 
+* [Akamai Edge DNS](docs/tutorials/akamai-edgedns.md)
 * [Alibaba Cloud](docs/tutorials/alibabacloud.md)
 * AWS
 	* [ALB Ingress Controller](docs/tutorials/alb-ingress.md)
@@ -171,6 +177,7 @@ The following tutorials are provided:
 * [UltraDNS](docs/tutorials/ultradns.md)
 * [GoDaddy](docs/tutorials/godaddy.md)
 * [Gandi](docs/tutorials/gandi.md)
+* [SafeDNS](docs/tutorials/safedns.md)
 
 ### Running Locally
 

diff --git a/charts/external-dns/Chart.yaml b/charts/external-dns/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: external-dns
 description: ExternalDNS synchronizes exposed Kubernetes Services and Ingresses with DNS providers.
 type: application
-version: 1.7.0
+version: 1.7.1
 appVersion: 0.10.2
 keywords:
   - kubernetes

diff --git a/charts/external-dns/README.md b/charts/external-dns/README.md
@@ -33,6 +33,7 @@ The following table lists the configurable parameters of the _ExternalDNS_ chart
 | `serviceAccount.name`             | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the full name template.                                                                                                                                                                                       | `""`                                   |
 | `rbac.create`                     | If `true`, create the RBAC resources.                                                                                                                                                                                                                                                                                 | `true`                                 |
 | `rbac.additionalPermissions`      | Additional permissions to be added to the cluster role.                                                                                                                                                                                                                                                               | `{}`                                   |
+| `deploymentAnnotations`           | Annotations to add to the Deployment.                                                                                                                                                                                                                                                                                 | `{}`                                   |
 | `podLabels`                       | Labels to add to the pod.                                                                                                                                                                                                                                                                                             | `{}`                                   |
 | `podAnnotations`                  | Annotations to add to the pod.                                                                                                                                                                                                                                                                                        | `{}`                                   |
 | `podSecurityContext`              | Security context for the pod, this supports the full [PodSecurityContext](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#podsecuritycontext-v1-core) API.                                                                                                                                       | _see values.yaml_                      |
@@ -54,6 +55,7 @@ The following table lists the configurable parameters of the _ExternalDNS_ chart
 | `nodeSelector`                    | Node labels for pod assignment.                                                                                                                                                                                                                                                                                       | `{}`                                   |
 | `tolerations`                     | Tolerations for pod assignment, this supports the full [Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#toleration-v1-core) API.                                                                                                                                                     | `[]`                                   |
 | `affinity`                        | Affinity settings for pod assignment, this supports the full [Affinity](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#affinity-v1-core) API.                                                                                                                                                   | `{}`                                   |
+| `topologySpreadConstraints`       | TopologySpreadConstraint settings for pod assignment, this supports the full [TopologySpreadConstraints](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.22/#topologyspreadconstraint-v1-core) API.                                                                                                  | `[]`                                   |
 | `logLevel`                        | Verbosity of the logs, available values are: `panic`, `debug`, `info`, `warn`, `error`, `fatal`.                                                                                                                                                                                                                      | `info`                                 |
 | `logFormat`                       | Formats of the logs, available values are: `text`, `json`.                                                                                                                                                                                                                                                            | `text`                                 |
 | `interval`                        | The interval for DNS updates.                                                                                                                                                                                                                                                                                         | `1m`                                   |

diff --git a/charts/external-dns/templates/clusterrole.yaml b/charts/external-dns/templates/clusterrole.yaml
@@ -30,7 +30,7 @@ rules:
     verbs: ["get","watch","list"]
 {{- end }}
 
-{{- if has "istio-gateway" .Values.sources }}
+{{- if or (has "istio-gateway" .Values.sources) (has "istio-virtualservice" .Values.sources) }}
   - apiGroups: ["networking.istio.io"]
     resources: ["gateways"]
     verbs: ["get","watch","list"]

diff --git a/charts/external-dns/templates/deployment.yaml b/charts/external-dns/templates/deployment.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "external-dns.fullname" . }}
   labels:
     {{- include "external-dns.labels" . | nindent 4 }}
+  {{- with .Values.deploymentAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   replicas: 1
   selector:
@@ -67,6 +71,9 @@ spec:
             {{- if .Values.txtPrefix }}
             - --txt-prefix={{ .Values.txtPrefix }}
             {{- end }}
+            {{- if and (eq .Values.txtPrefix "") (ne .Values.txtSuffix "") }}
+            - --txt-suffix={{ .Values.txtSuffix }}
+            {{- end }}
             {{- end }}
             {{- range .Values.domainFilters }}
             - --domain-filter={{ . }}
@@ -103,6 +110,10 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/external-dns/values.yaml b/charts/external-dns/values.yaml
@@ -26,8 +26,12 @@ rbac:
   create: true
   additionalPermissions: {}
 
+# Annotations to add to the Deployment
+deploymentAnnotations: {}
+
 podLabels: {}
 
+# Annotations to add to the Pod
 podAnnotations: {}
 
 podSecurityContext:
@@ -88,6 +92,8 @@ tolerations: []
 
 affinity: {}
 
+topologySpreadConstraints: []
+
 logLevel: info
 logFormat: text
 
@@ -103,6 +109,7 @@ policy: upsert-only
 registry: txt
 txtOwnerId: ""
 txtPrefix: ""
+txtSuffix: ""
 
 domainFilters: []
 

diff --git a/docs/contributing/getting-started.md b/docs/contributing/getting-started.md
@@ -1,7 +1,7 @@
 # Quick Start
 
 - [Git](https://git-scm.com/downloads)
-- [Go 1.16+](https://golang.org/dl/)
+- [Go 1.17+](https://golang.org/dl/)
 - [Go modules](https://github.com/golang/go/wiki/Modules)
 - [golangci-lint](https://github.com/golangci/golangci-lint)
 - [Docker](https://docs.docker.com/install/)

diff --git a/docs/proposal/registry.md b/docs/proposal/registry.md
@@ -122,8 +122,4 @@ A single loop iteration of external-dns operation:
 1. DNS Provider should use batch operations
 2. DNS Provider should be called with CREATE operation (not UPSERT!) when the record does not yet exist!
 
-### Resources:
 
-1. Registry implementation draft: 
-
-[Flow](https://lh3.googleusercontent.com/BNUZZQ8XivYkXyYVPDgPCoZpwYv0pOyoyfBKbOnYJGsqueeB-EUXfzBZLk7xP-E_GDo7YHiTlA4XgPEs6ao_Ex0TY2SN66-yg5iRmn5Tc2EXVqs_yS9CtumhE1T4krZc4Z8_1gHOirDxCegU-Fk0K3fvg-J3UpzdKmGDG-JZwdzRyP4WyORWUQilJO9jErh-HP8AtM8p2ZjiqN9B3-VXdYuHbsiR6EHNFw43aOQAk52muDf2AgjqX2YUSbN9eO0Akt39ien3euT2HsZJlPvm5s8v2a_ZqTSW0DVcGaRhLQbZXcogSEP-ebbuGunuVbz45Ws8X6zJhZpASNQ-jknhGZEhZkSAQdwvihZpTsDdUuJx9RFDXNwA0lEaE_xediW119uJGywSNc6w8hnJZ6Xo49YQStuGbJKRAieQMvEhZXofiqCKyOUXSlsO7j9iE-rzis0JRSHWB8acA3AlcXqBj9D70AHfRHC_HfBLw9lcusy4dInmK2OCzGqXV11PoqibiZPqh-oNED31pToZQk4NB1xbOuUC_Tjf8UR_xAyhJ3yKzS09K898uCf-87Ra4iqRDCz3N35b=w2560-h1260)