Skip to content

Commit

Permalink
Merge pull request #23 from bcrochet/rebase-to-upstream-1.6.6
Browse files Browse the repository at this point in the history
Bug 1801343: Rebase to upstream 1.6.6
  • Loading branch information
openshift-merge-robot committed Feb 19, 2020
2 parents 51569b2 + 358bd8f commit 052209a
Show file tree
Hide file tree
Showing 2,049 changed files with 161,938 additions and 111,422 deletions.
20 changes: 8 additions & 12 deletions .circleci/config.yml
Expand Up @@ -13,25 +13,22 @@ initWorkingDir: &initWorkingDir
GOROOT=$(go env GOROOT)
sudo rm -r $(go env GOROOT)
sudo mkdir $GOROOT
curl https://dl.google.com/go/go1.12.5.linux-amd64.tar.gz | sudo tar xz -C $GOROOT --strip-components=1
LATEST=$(curl -s https://golang.org/VERSION?m=text)
curl https://dl.google.com/go/${LATEST}.linux-amd64.tar.gz | sudo tar xz -C $GOROOT --strip-components=1
integrationDefaults: &integrationDefaults
machine:
image: ubuntu-1604:201903-01
working_directory: ~/go/src/${CIRCLE_PROJECT_USERNAME}/coredns
environment:
- K8S_VERSION: v1.13.3
- KUBECONFIG: /home/circleci/.kube/config
- MINIKUBE_VERSION: v0.33.1
- MINIKUBE_WANTUPDATENOTIFICATION: false
- MINIKUBE_WANTREPORTERRORPROMPT: false
- CHANGE_MINIKUBE_NONE_USER: true
- MINIKUBE_HOME: /home/circleci
- K8S_VERSION: v1.15.3
- KIND_VERSION: v0.5.1
- KUBECONFIG: /home/circleci/.kube/kind-config-kind

setupKubernetes: &setupKubernetes
- run:
name: Setup Kubernetes
command: ~/go/src/${CIRCLE_PROJECT_USERNAME}/ci/build/kubernetes/minikube_setup.sh
command: ~/go/src/${CIRCLE_PROJECT_USERNAME}/ci/build/kubernetes/k8s_setup.sh

buildCoreDNSImage: &buildCoreDNSImage
- run:
Expand All @@ -40,8 +37,7 @@ buildCoreDNSImage: &buildCoreDNSImage
cd ~/go/src/${CIRCLE_PROJECT_USERNAME}/coredns
make coredns SYSTEM="GOOS=linux" && \
docker build -t coredns . && \
docker tag coredns localhost:5000/coredns && \
docker push localhost:5000/coredns
kind load docker-image coredns
jobs:
kubernetes-tests:
Expand All @@ -60,7 +56,7 @@ jobs:
name: Run Kubernetes tests
command: |
cd ~/go/src/${CIRCLE_PROJECT_USERNAME}/ci/test/kubernetes
GO111MODULE=on go test -v ./...
go test -v ./...
workflows:
version: 2
Expand Down
11 changes: 11 additions & 0 deletions .dreck.yaml
@@ -0,0 +1,11 @@
features:
- aliases
- exec

aliases:
- |
/plugin (.*) -> /label plugin/$1
- |
/wai -> /label works as intended
- |
/release (.*) -> /exec /opt/bin/release-coredns $1
File renamed without changes.
1 change: 0 additions & 1 deletion .github/CONTRIBUTING.md

This file was deleted.

81 changes: 81 additions & 0 deletions .github/CONTRIBUTING.md
@@ -0,0 +1,81 @@
# Contributing to CoreDNS

Welcome! Our community focuses on helping others and making CoreDNS the best it can be. We gladly
accept contributions and encourage you to get involved!

## Bug Reports

First, please [search this
repository](https://github.com/coredns/coredns/search?q=&type=Issues&utf8=%E2%9C%93) with a variety
of keywords to ensure your bug is not already reported.

If not, [open an issue](https://github.com/coredns/coredns/issues) and answer the questions so we
can understand and reproduce the problematic behavior.

The burden is on you to convince us that it is actually a bug in CoreDNS. This is easiest to do when
you write clear, concise instructions so we can reproduce the behavior (even if it seems obvious).
The more detailed and specific you are, the faster we will be able to help you. Check out [How to
Report Bugs Effectively](https://www.chiark.greenend.org.uk/~sgtatham/bugs.html).

Please be kind. :smile: Remember that CoreDNS comes at no cost to you, and you're getting free help.

## Minor Improvements and New Tests

Submit [pull requests](https://github.com/coredns/coredns/pulls) at any time. Make sure to write
tests to assert your change is working properly and is thoroughly covered.

## New Features

First, please [search](https://github.com/coredns/coredns/search?q=&type=Issues&utf8=%E2%9C%93) with
a variety of keywords to ensure your suggestion/proposal is new.

Please also check for existing pull requests to see if someone is already working on this. We want
to avoid duplication of effort.

If the proposal is new and no one has opened pull request yet, you may open either an issue or a
pull request for discussion and feedback.

If you are going to spend significant time implementing code for a pull request, best to open an
issue first and "claim" it and get feedback before you invest a lot of time.

**If someone already opened a pull request, but you think the pull request has stalled and you would
like to open another pull request for the same or similar feature, get some of the maintainers (see
[CODEOWNERS](CODEOWNERS)) involved to resolve the situation and move things forward.**

If possible make a pull request as small as possible, or submit multiple pull request to complete a
feature. Smaller means: easier to understand and review. This in turn means things can be merged
faster.

## New Plugins

A new plugin is (usually) about 1000 lines of Go. This includes tests and some plugin boiler plate.
This is a considerable amount of code and will take time to review. To prevent too much back and
forth it is advisable to start with the plugin's `README.md`; This will be its main documentation
and will help nail down the correct name of the plugin and its various config options.

From there it can work its way through the rest (`setup.go`, the `ServeDNS` handler function, etc.).
Doing this will help the reviewers, as each chunk of code is relatively small.

Also read [plugin.md](https://raw.githubusercontent.com/coredns/coredns/master/plugin.md) for
advice on how to write a plugin.

## Updating Dependencies

We use [Go Modules](https://github.com/golang/go/wiki/Modules) as the tool to manage vendor dependencies.

Use the following to update the version of all dependencies
```sh
$ go get -u
```

After the dependencies have been updated or added, you might run the following to
cleanup the go module files:
```sh
$ go mod tidy
```

Please refer to [Go Modules](https://github.com/golang/go/wiki/Modules) for more details.

# Thank You

Thanks for your help! CoreDNS would not be what it is today without your contributions.
8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,27 @@
---
name: Bug Report
about: Report a bug encountered while using CoreDNS
labels: bug

---

<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
If the matter is security related, please disclose it privately via security@coredns.io
-->

**What happened**:

**What you expected to happen**:

**How to reproduce it (as minimally and precisely as possible)**:

**Anything else we need to know?**:

**Environment**:

- the version of CoreDNS:
- Corefile:
- logs, if applicable:
- OS (e.g: `cat /etc/os-release`):
- Others:
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,11 @@
---
name: Enhancement Request
about: Suggest an enhancement to the CoreDNS project
labels: enhancement

---
<!-- Please only use this template for submitting enhancement requests -->

**What would you like to be added**:

**Why is this needed**:
File renamed without changes.
19 changes: 0 additions & 19 deletions .github/stale.yml

This file was deleted.

43 changes: 43 additions & 0 deletions .github/workflows/go.tidy.yml
@@ -0,0 +1,43 @@
name: go tidy

on:
push:
branches:
- 'master'
paths:
- '.github/workflows/go.tidy.yml'
- 'go.mod'
- 'go.sum'

jobs:
fix:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v1
-
# https://github.com/actions/checkout/issues/6
name: Fix detached HEAD
run: git checkout ${GITHUB_REF#refs/heads/}
-
name: Tidy
run: |
rm -f go.sum
go mod tidy
-
name: Set up Git
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 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 push
fi
4 changes: 3 additions & 1 deletion .gitignore
@@ -1,7 +1,7 @@
query.log
Corefile
*.swp
coredns
^coredns$
coredns.exe
coredns.exe~
kubectl
Expand All @@ -13,3 +13,5 @@ coverage.txt
.classpath
.project
.settings/**
build/
release/
1 change: 0 additions & 1 deletion .release

This file was deleted.

19 changes: 13 additions & 6 deletions .travis.yml
@@ -1,8 +1,9 @@
dist: xenial

services:
- docker
language: go
go:
- "1.12.x"
- "1.13.x"

cache:
directories:
Expand All @@ -18,10 +19,16 @@ branches:
- master

env:
- TEST_TYPE=coverage
- TEST_TYPE=integration
- TEST_TYPE=core
- TEST_TYPE=plugin
global:
# This is FUZZIT_API_KEY
- secure: "IGpZAyt1e5BZ1C4LeJG+GrgFZzaBQkJ3BX/+MwWN85aJSDk5gwThS53OCr/7RFgBKBgP9xBv9i9hAv0PxVaRE0ETIzjc0rQzceJIWiYKfFYQyscFahKfSiGsWP32rMlU3K67tA7yITS+Z8mMyVH9Ndr1Fg9AmLL+WfATdrd6dP8hzsUpaghKlnJee9TycrfamDpISzecdOY9xzxcwRyphZxuCc/n236Nt7f7Ccz0zx/Qa5igX6mjKZpUyBpS2u02GmNJTfc3W5SbTRP5bSJ+ozSkZZyG3tTpYmeN87AQJ/oG7rUEzqGLt78i7jSYAXghJZT06H/fHFsOKssCj1m0hYiarnGoGzXScLDqp2fpkyzilsUT+W0VgXTy2Nq+88Sideiy6UwDwpqHr5ktyoYFeSVB/aCTJl5oxDxBqs9dfeJSEAy7/AYy8kJoIE/yPYsBnGw10CAED4Rf5mfDgstkZRBdAO0xLBihkPsgza2975DVf27YSjJZ4eKrnR+G/aNCKycLQvWD/5c2bcLCJqyz0uMLQC/4LspS9b5bAKurzqFRdrD5q78NDcbodHelc7zBlFrRwGFCUjXTbQoU6r+1FA8y2Z+n1bd7mIF1JBVHurYAygyYXOcry870hyucGojonvdgBvHp6txeYyPU14VvTNwkF2mddpBCvoSTSPZ5X64="
matrix:
- TEST_TYPE=coverage
- TEST_TYPE=integration
- TEST_TYPE=core
- TEST_TYPE=plugin
# - TEST_TYPE=fuzzit FUZZIT_TYPE=local-regression
# - TEST_TYPE=fuzzit FUZZIT_TYPE=fuzzing

# In the Travis VM-based build environment, IPv6 networking is not
# enabled by default. The sysctl operations below enable IPv6.
Expand Down
2 changes: 1 addition & 1 deletion ADOPTERS.md
Expand Up @@ -9,7 +9,7 @@
* [Z Lab](https://zlab.co.jp) uses CoreDNS in production combination with Consul and Kubernetes Clusters.
* [Serpro/estaleiro](estaleiro.serpro.gov.br) uses CoreDNS as Kubernetes' DNS Server, in production with tuned Kubernetes plugin options
* [Lumo](https://thinklumo.com) uses CoreDNS as Kubernetes' DNS Server, in production and lab with default configuration
* [Booming Games](https://booming-games.com) uses CoreDNS in multiple Kubernetes clusters, with Federation plugin. expect going to production soon.
* [Booming Games](https://booming-games.com) uses CoreDNS in multiple Kubernetes clusters, with Federation plugin. expect to go into production soon.
* [Sodimac](https://www.sodimac.cl) uses CoreDNS with Kubernetes in production with default configuration.
* [Bose](https://www.bose.com/) uses CoreDNS with Kubernetes in production on very large cluster (over 250 nodes)
* [farmotive](https://farmotive.io) uses CoreDNS in Kubernetes using default configuration, in its Lab. Expect to be in production soon.
Expand Down
52 changes: 52 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
@@ -0,0 +1,52 @@
# @miekg, miek@miek.nl, project lead: 11/11/2020

* @bradbeam @chrisohaver @dilyevsky @fastest963 @greenpau @grobie @isolus @johnbelamaric @miekg @pmoroney @rajansandeep @stp-ip @superq @yongtang

/plugin/pkg/ @miekg @chrisohaver @johnbelamaric @yongtang @stp-ip
/coremain/ @miekg @chrisohaver @johnbelamaric @yongtang @stp-ip
/core/ @miekg @chrisohaver @johnbelamaric @yongtang @stp-ip
/request/ @miekg @chrisohaver @johnbelamaric @yongtang @stp-ip
/plugin/* @miekg @chrisohaver @johnbelamaric @yongtang @stp-ip
go.sum @miekg @chrisohaver @johnbelamaric @yongtang @stp-ip
go.mod @miekg @chrisohaver @johnbelamaric @yongtang @stp-ip

/plugin/acl/ @miekg @ihac
/plugin/any/ @miekg
/plugin/auto/ @miekg @stp-ip
/plugin/autopath/ @chrisohaver @miekg
/plugin/azure/ @miekg @yongtang @darshanime
/plugin/bind/ @miekg
/plugin/bufsize/ @ykhr53
/plugin/cache/ @grobie @miekg
/plugin/cancel/ @miekg
/plugin/chaos/ @miekg
/plugin/clouddns/ @miekg @yongtang
/plugin/dnssec/ @isolus @miekg
/plugin/dnstap/ @varyoo @yongtang
/plugin/erratic/ @miekg
/plugin/errors/ @miekg
/plugin/etcd/ @miekg @nitisht
/plugin/file/ @miekg @yongtang @stp-ip
/plugin/forward/ @grobie @johnbelamaric @miekg @rdrozhdzh
/plugin/grpc/ @inigohu @miekg
/plugin/health/ @fastest963 @miekg
/plugin/hosts/ @johnbelamaric @pmoroney
/plugin/k8s_external/ @miekg
/plugin/kubernetes/ @bradbeam @chrisohaver @johnbelamaric @miekg @rajansandeep @yongtang
/plugin/loadbalance/ @miekg
/plugin/log/ @miekg @nchrisdk
/plugin/loop/ @miekg @chrisohaver
/plugin/metadata/ @ekleiner @miekg
/plugin/metrics/ @fastest963 @miekg @superq @greenpau
/plugin/nsid/ @yongtang
/plugin/pprof/ @miekg
/plugin/reload/ @johnbelamaric
/plugin/rewrite/ @greenpau @johnbelamaric
/plugin/root/ @miekg
/plugin/route53/ @yongtang @dilyevsky
/plugin/secondary/ @bradbeam @miekg
/plugin/template/ @rtreffer
/plugin/tls/ @johnbelamaric
/plugin/trace/ @johnbelamaric
/plugin/transfer/ @miekg @chrisohaver
/plugin/whoami/ @miekg @chrisohaver
1 change: 1 addition & 0 deletions CODE_OF_CONDUCT.md

0 comments on commit 052209a

Please sign in to comment.