merge coredns/coredns v1.8.4

.circleci/config.yml

@@ -56,6 +56,7 @@ jobs:
           name: Run Kubernetes tests
           command: |
             cd ~/go/src/${CIRCLE_PROJECT_USERNAME}/ci/test/kubernetes
+            go mod download
             go test -v ./...
 
 workflows:

.dockerignore

@@ -0,0 +1,2 @@
+*
+!coredns

.github/ISSUE_TEMPLATE/question.md

@@ -4,4 +4,7 @@ about: A question related to CoreDNS
 labels: question
 
 ---
-<!-- Please only use this template for submitting a generic question -->
+<!--
+Please only use this template for submitting a generic question.
+Or consider using a GitHub discussion https://github.com/coredns/coredns/discussions
+-->

.github/SECURITY.md

@@ -115,7 +115,7 @@ When in doubt push forward and go public ASAP.
 
 - the Fix Team will selectively choose all needed commits from the Master branch in order to create a new release on top of the current last version released.
 - Release process will be as usual.
-- The Fix Lead will request a CVE from [DWF](https://github.com/distributedweaknessfiling/DWF-Documentation)
+- The Fix Lead will request a CVE from [DWF](https://github.com/distributedweaknessfiling/cvelist)
   and include the CVSS and release details.
 - The Fix Lead will inform all users, devs and integrators, now that everything is public,
   announcing the new releases, the CVE number, and the relevant merged PRs to get wide distribution

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/go.coverage.yml

@@ -1,5 +1,5 @@
 name: Go Coverage
-on: [push, pull_request]
+on: [pull_request]
 jobs:
   test:
     name: Coverage
@@ -8,8 +8,6 @@ jobs:
 
     - name: Install Go
       uses: actions/setup-go@v2
-      with:
-        go-version: 1.15
       id: go
 
     - name: Check out code

.github/workflows/go.fmt.yml

@@ -1,11 +1,8 @@
 name: Go Fmt
 
 on:
-  push:
-    branches:
-      - 'master'
-    paths:
-      - '**.go'
+  schedule:
+    - cron: '22 10 * * 1'
 
 jobs:
   fix:
@@ -23,14 +20,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git config user.name "coredns-auto-go-fmt[bot]"
-          git config user.email "coredns-auto-go-fmt[bot]@users.noreply.github.com"
+          git config user.name "coredns[bot]"
+          git config user.email "bot@bot.coredns.io"
           git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
       -
         name: Commit and push changes
         run: |
           git add .
           if output=$(git status --porcelain) && [ ! -z "$output" ]; then
-            git commit -m 'auto go fmt'
+            git commit -s -m 'auto go fmt'
             git push
           fi

.github/workflows/go.test.yml

@@ -8,8 +8,6 @@ jobs:
 
     - name: Install Go
       uses: actions/setup-go@v2
-      with:
-        go-version: 1.15
       id: go
 
     - name: Check out code
@@ -31,8 +29,6 @@ jobs:
 
     - name: Install Go
       uses: actions/setup-go@v2
-      with:
-        go-version: 1.15
       id: go
 
     - name: Check out code
@@ -51,8 +47,6 @@ jobs:
 
     - name: Install Go
       uses: actions/setup-go@v2
-      with:
-        go-version: 1.15
       id: go
 
     - name: Check out code
@@ -63,5 +57,20 @@ jobs:
 
     - name: Test
       run: |
-        go install github.com/fatih/faillint
+        go install github.com/fatih/faillint || true
         ( cd test; go test -race ./... )
+
+  test-makefile-release:
+    name: Test Makefile.release
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get install make curl
+
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Test Makefile
+      run:  make DOCKER=bla GITHUB_ACCESS_TOKEN=bla -n build docker github-push docker-push -f Makefile.release

.github/workflows/go.tidy.yml

@@ -1,13 +1,8 @@
 name: Go Tidy
 
 on:
-  push:
-    branches:
-      - 'master'
-    paths:
-      - '.github/workflows/go.tidy.yml'
-      - 'go.mod'
-      - 'go.sum'
+  schedule:
+    - cron: '22 10 * * 3'
 
 jobs:
   fix:
@@ -26,14 +21,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git config user.name "coredns-auto-go-mod-tidy[bot]"
-          git config user.email "coredns-auto-go-mod-tidy[bot]@users.noreply.github.com"
+          git config user.name "coredns[bot]"
+          git config user.email "bot@bot.coredns.io"
           git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
       -
         name: Commit and push changes
         run: |
           git add .
           if output=$(git status --porcelain) && [ ! -z "$output" ]; then
-            git commit -m 'auto go mod tidy'
+            git commit -s -m 'auto go mod tidy'
             git push
           fi

.github/workflows/make.doc.yml

@@ -1,14 +1,8 @@
 name: Make Doc
 
 on:
-  push:
-    branches:
-      - 'master'
-    paths:
-      - '.github/workflows/make.doc.yml'
-      - 'coredns.1.md'
-      - 'corefile.5.md'
-      - 'plugin/*/README.md'
+  schedule:
+    - cron: '22 10 * * 0'
 
 jobs:
   fix:
@@ -20,8 +14,6 @@ jobs:
       -
         name: Setup Go
         uses: actions/setup-go@v2
-        with:
-          go-version: '^1.14.1'
       -
         name: Update Docs
         run: |
@@ -32,14 +24,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git config user.name "coredns-auto-go-mod-tidy[bot]"
-          git config user.email "coredns-auto-go-mod-tidy[bot]@users.noreply.github.com"
+          git config user.name "coredns[bot]"
+          git config user.email "bot@bot.coredns.io"
           git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
       -
         name: Commit and push changes
         run: |
           git add .
           if output=$(git status --porcelain) && [ ! -z "$output" ]; then
-            git commit -m 'auto make -f Makefile.doc'
+            git commit -s -m 'auto make -f Makefile.doc'
             git push
           fi

.github/workflows/whitespace.yml

@@ -1,11 +1,8 @@
 name: Remove Trailing Whitespaces
 
 on:
-  push:
-    branches:
-      - 'master'
-    paths-ignore:
-      - '**.go'
+  schedule:
+    - cron: '22 10 * * 2'
 
 jobs:
   fix:
@@ -23,14 +20,14 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git config user.name "coredns-auto-trailing-whitespaces[bot]"
-          git config user.email "coredns-auto-trailing-whitespaces[bot]@users.noreply.github.com"
+          git config user.name "coredns[bot]"
+          git config user.email "bot@bot.coredns.io"
           git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git
       -
         name: Commit and push changes
         run: |
           git add .
           if output=$(git status --porcelain) && [ ! -z "$output" ]; then
-            git commit -m 'auto remove trailing whitespaces'
+            git commit -s -m 'auto remove trailing whitespaces'
             git push
           fi

.gitignore

@@ -1,7 +1,6 @@
-query.log
-Corefile
-*.swp
-/coredns
+# only add build artifacts concerning coredns - no editor related files
+coredns
 coredns.exe
 build/
 release/
+vendor/

ADOPTERS.md

@@ -25,6 +25,8 @@
 * [AdGuard](https://adguard.com/) uses CoreDNS in [AdGuard Home](https://github.com/AdguardTeam/AdGuardHome) and, therefore, in production public AdGuard DNS servers.
 * [Skyscanner](https://www.skyscanner.net) uses CoreDNS within Kubernetes in production with the configuration tuned to use the Autopath plugin.
 * [Zinza Technology](https://zinza.com.vn) uses CoreDNS within Kubernetes in production, with standard configuration.
-* [Hualala](https://www.hualala.com/home)  uses CoreDNS in Kubernetes using default configuration, in its Lab. Expected to be in production soon.
+* [Hualala](https://www.hualala.com)  uses CoreDNS in Kubernetes using default configuration, in its Lab. Expected to be in production soon.
 * [Hellofresh](https://www.hellofresh.com/) uses CoreDNS in multiple Kubernetes clusters, with Forward plugin.
 * [Render](https://render.com) uses CoreDNS in production across all its Kubernetes clusters.
+* [BackMarket](https://www.backmarket.com) uses CoreDNS within Kubernetes in production, with standard configuration.
+* [Absa Group](https://www.absa.africa) uses CoreDNS as an integral part of Kubernetes Global Balancer project - [k8gb](https://www.k8gb.io/).

Makefile

@@ -33,19 +33,3 @@ pb:
 clean:
 	go clean
 	rm -f coredns
-
-.PHONY: dep-ensure
-dep-ensure:
-	dep version || go get -u github.com/golang/dep/cmd/dep
-	dep ensure -v
-	dep prune -v
-	find vendor -name '*_test.go' -delete
-
-.PHONY: test
-test: check
-	( cd request ; go test -v -race ./... )
-	( cd core ; go test -v -race  ./... )
-	( cd coremain ; go test -v -race ./... )
-	( cd test ; go test -v -race ./... )
-	( cd plugin ; go test -v -race ./... )
-