NE-514: Rebase to upstream v1.8.1 #52

sgreene570 · 2021-02-22T19:35:16Z

CoreDNS v1.8.1 rebase process

Inspired by the commit description for the v1.6.6 rebase #22

As well as by openshift/kubernetes-autoscaler#185

Identify carry commits:

git log --oneline --no-merges 0858c65b340b205e2831ffb85cb95c14c6bd5266..openshift/master
where (0858c65) reflects the changes since our last rebase.

Note that the UPSTREAM: <carry>: openshift: prefix was added to any new commits to carry since the previous rebase. This will make new carry commits easy to identify alongside prior carry commits.

After identifying the carry commits, the next step is to create the new commit-tree that will be used for the rebase and then cherry pick the carry commits into the new branch.

The following commands cover these steps:

Process

$ git remote update # make sure we update our refs
$ git checkout v1.8.1 # upstream CoreDNS 1.8.1 commit tag
$ git checkout -b merge-tmp # create a branch to do our merge work from
$ git checkout openshift/master # we want to be at the tip of the openshift master branch when we run the next command
$ echo 'merge coredns/coredns v1.8.1' | git commit-tree merge-tmp^{tree} -p HEAD -p merge-tmp -F -
deadbeef12345678 # id of new merge commit
$ git branch merge-1.8.1 deadbeef12345678 # create a new branch for the cherry-pick work
$ git checkout merge-1.8.1 # make sure we are on the proper branch
$ git cherry-pick <carry commits>

My 1.8.1 merge commit from the above process is (e769ec9).

With the merge-1.8.1 branch in place, I cherry picked the carry commits. Merge conflicts were resolved on an individual commit basis when necessary. Some commits (eg. vendor changes, or upstream fixes that have merged since our last rebase) were dropped. If there are any questions there please let me know.

Carried Commits (applied bottom to top / oldest first):

4a5fb483d UPSTREAM: <carry>: openshift: Vendor required modules (to be replaced in the next rebase)
c8b493bbe UPSTREAM: <carry>: openshift: Updating coredns builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/5a1293dd0f380abf50c12d65c36655486d7745d0/images/coredns.yml
0fecda9e4 UPSTREAM: <carry>: openshift: Updating coredns builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b0ab44b419faae6b18e639e780a1fa50a1df8521/images/coredns.yml
1a98e7b92 UPSTREAM: <carry>: openshift: gitignore: Properly ignore coredns binary
665e4bb8a UPSTREAM: <carry>: openshift: Updating coredns builder & base images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ac81dd4ff0bd57c4e75058d25b40615b92948259/images/coredns.yml
1462051fa UPSTREAM: <carry>: openshift: Update owners
2fa061a96 UPSTREAM: <carry>: openshift: Updating Dockerfile.openshift.rhel7 baseimages to mach ocp-build-data config
f1c1c7dc2 UPSTREAM: <carry>: openshift: Updating Dockerfile.openshift.rhel7 baseimages to mach ocp-build-data config
12da9afc5 UPSTREAM: <carry>: openshift: OWNERS: Add component
c2d922636 UPSTREAM: <carry>: openshift: Add github.com/openshift/coredns-mdns plugin
07acbeb99 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
973ad6860 UPSTREAM: <carry>: openshift: Set Dockerfiles to use vendor
a6e80500e UPSTREAM: <carry>: openshift: Add a `make test` target
73e0eb379 UPSTREAM: <carry>: openshift: Optimize COPY directive
40c11e7a7 UPSTREAM: <carry>: openshift: Add a RHEL7 Dockerfile and standardize format
f77295fe6 UPSTREAM: <carry>: openshift: Use multistage builds
394b61745 UPSTREAM: <carry>: openshift: Update metadata
b65c0ca72 UPSTREAM: <carry>: openshift: Add a product build pipeline Dockerfile
ce59f0f55 UPSTREAM: <carry>: openshift: Changed the OWNERS to OpenShift ones

Dropped Commits (vendor commits are not necessary, and upstream commits from our fork would be taken care of by the rebase. No need to keep empty commits around).

5dec8e11d vendor: Bump for kube 1.20 // DROPPED
56a13f8ed go.mod: Bump for kube 1.20 // DROPPED
283fd1454 vendor: Bump Azure/go-autorest // DROPPED
89b08daba go.mod: Bump Azure/go-autorest // DROPPED
7bf2aa0b8 Remove federation plugin // DROPPED
59fab1734 Kubernetes plugin fixes for kube 1.18 API bump // DROPPED
27af8bcc9 Update kubernetes plugin object.go for kube 1.17 // DROPPED
9d7cda6d9 vendor: Bump deps for kube 1.19 // DROPPED
1f4fb828b go.mod: Bump deps for kube 1.19 // DROPPED
1689a12d8 plugin/kubernetes: Handle endpoint tombstones (#3887) // DROPPED
6116f47bb Bug 1860142: Adds HealthcheckBrokenCount to forward plugin // DROPPED
a9a2519fa Vendor latest golang.org/x/text // DROPPED
3f7b0299c Update vendoring of coredns-mdns // DROPPED
392872f64 Update coredns-mdns vendoring // DROPPED
aeba6024d Update coredns-mdns vendoring // DROPPED
358bd8f4e UPSTREAM: <carry>: openshift: Vendor required modules // DROPPED
5e1e5be0e UPSTREAM: <carry>: openshift: Fix HostPortOrFile to support IPv6 addresses with zone (#3527) // DROPPED

Prerequisites:

/cc @bcrochet @cybertron (Thanks for the help, kudos to both of you!)
@openshift/openshift-team-network-edge

Bumps [github.com/Azure/go-autorest/autorest](https://github.com/Azure/go-autorest) from 0.11.2 to 0.11.3. - [Release notes](https://github.com/Azure/go-autorest/releases) - [Changelog](https://github.com/Azure/go-autorest/blob/master/CHANGELOG.md) - [Commits](Azure/go-autorest@autorest/v0.11.2...autorest/v0.11.3) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Signed-off-by: Yong Tang <[email protected]>

Set these options of the requests warrents them. Signed-off-by: Miek Gieben <[email protected]>

…oredns#4070) Bumps [github.com/Azure/go-autorest/autorest/azure/auth](https://github.com/Azure/go-autorest) from 0.5.0 to 0.5.1. - [Release notes](https://github.com/Azure/go-autorest/releases) - [Changelog](https://github.com/Azure/go-autorest/blob/master/CHANGELOG.md) - [Commits](Azure/go-autorest@tracing/v0.5.0...autorest/azure/auth/v0.5.1) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.18.6 to 0.18.8. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](kubernetes/api@v0.18.6...v0.18.8) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.18.6 to 0.18.8. - [Release notes](https://github.com/kubernetes/client-go/releases) - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.18.6...v0.18.8) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

…redns#4072) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.34.0 to 1.34.5. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-go@v1.34.0...v1.34.5) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Update README.md Specify that serial must change for the zone file to be reloaded. Signed-off-by: Grant Garrett-Grossman <[email protected]> * Update plugin/auto/README.md Co-authored-by: Miek Gieben <[email protected]> Signed-off-by: Grant Garrett-Grossman <[email protected]> Co-authored-by: Miek Gieben <[email protected]>

Signed-off-by: Zhou Hao <[email protected]>

* Enable debug globally if enabled in any server config It was currently enabled only if the plugin debug was enabled in the last server config of the Corefile. Signed-off-by: Olivier Lemasle <[email protected]> * Add test and update debug's README Signed-off-by: Olivier Lemasle <[email protected]>

* Update the 1.7.1 notes Add bunch of PR, remote the text that should show up in the 1.8.0 release. Signed-off-by: Miek Gieben <[email protected]> * Update notes/coredns-1.7.1.md Co-authored-by: Chris O'Haver <[email protected]> Co-authored-by: Chris O'Haver <[email protected]>

Bumps [github.com/Azure/go-autorest/autorest](https://github.com/Azure/go-autorest) from 0.11.3 to 0.11.4. - [Release notes](https://github.com/Azure/go-autorest/releases) - [Changelog](https://github.com/Azure/go-autorest/blob/master/CHANGELOG.md) - [Commits](Azure/go-autorest@autorest/v0.11.3...autorest/v0.11.4) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.18.8 to 0.19.0. - [Release notes](https://github.com/kubernetes/client-go/releases) - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.18.8...v0.19.0) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

…oredns#4092) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.34.5 to 1.34.13. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-go@v1.34.5...v1.34.13) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Stop the context so the refresh loop terminates on restart. Fixes: coredns#3815 Signed-off-by: Miek Gieben <[email protected]>

Signed-off-by: Hu Shuai <[email protected]>

The latest commit (e233f59) on master branch introduced a trailing whitespace and is causing Travis CI build to fail: https://travis-ci.org/github/coredns/coredns/builds/722988413 This PR fixes the failing test. Signed-off-by: Yong Tang <[email protected]>

…oredns#4105) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.34.13 to 1.34.18. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/master/CHANGELOG.md) - [Commits](aws/aws-sdk-go@v1.34.13...v1.34.18) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

…coredns#4107) Bumps [github.com/dnstap/golang-dnstap](https://github.com/dnstap/golang-dnstap) from 0.2.0 to 0.2.1. - [Release notes](https://github.com/dnstap/golang-dnstap/releases) - [Commits](dnstap/golang-dnstap@v0.2.0...v0.2.1) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

openshift/coredns#52 updates openshift/coredns to use coredns/coredns v1.8.1. CoreDNS v1.7.0 added breaking metrics renaming changes. This commit changes the following metric names to match the naming used in CoreDNS v1.7.0 and beyond: * `coredns_dns_response_rcode_count_total` -> `coredns_dns_responses_total` * `coredns_panic_count_total` -> `coredns_panics_total` See https://coredns.io/2020/06/15/coredns-1.7.0-release/ for more context.

sgreene570 · 2021-03-02T16:55:25Z

/retest

sgreene570 · 2021-03-03T14:42:59Z

CI is all green 😁

cybertron · 2021-03-03T22:39:51Z

/lgtm

This may not work because of #52 (comment) Maybe it's not happy because we authored commits? I am a member of the openshift org so that shouldn't be it.

openshift-ci-robot · 2021-03-03T22:39:52Z

@cybertron: changing LGTM is restricted to collaborators

In response to this:

/lgtm

This may not work because of #52 (comment) Maybe it's not happy because we authored commits? I am a member of the openshift org so that shouldn't be it.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

rfredette · 2021-03-05T17:40:37Z

/lgtm

openshift-ci-robot · 2021-03-05T17:40:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cybertron, rfredette, sgreene570

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [rfredette,sgreene570]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

sgreene570 · 2021-03-05T20:52:45Z

/retest

openshift-bot · 2021-03-05T21:38:52Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-03-05T23:49:10Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-03-06T00:41:07Z

/retest

Please review the full test history for this PR and help us cut down flakes.

dependabot-preview bot and others added 30 commits August 10, 2020 09:26

auto go mod tidy

fc8be1e

Bump to golang 1.15 (coredns#4064)

1efd7e3

Signed-off-by: Yong Tang <[email protected]>

pkg/upstream: set edns0 and Do when required (coredns#4055)

9230e17

Set these options of the requests warrents them. Signed-off-by: Miek Gieben <[email protected]>

auto go mod tidy

9ca82fb

auto go mod tidy

2baf2cd

auto go mod tidy

7ab9941

auto go mod tidy

aa16e0e

fix misspell (coredns#4081)

abeba46

Signed-off-by: Zhou Hao <[email protected]>

cleanup tempfiles for erratic_autopath_test (coredns#4080)

f6262eb

Signed-off-by: Zhou Hao <[email protected]>

auto make -f Makefile.doc

aced73f

auto go mod tidy

bbd341f

auto go mod tidy

8aace11

auto go mod tidy

c126e7f

clouddns,route53: fix lingering goroutines after restart (coredns#4096)

9e4a177

Stop the context so the refresh loop terminates on restart. Fixes: coredns#3815 Signed-off-by: Miek Gieben <[email protected]>

Fix some typos in comments. (coredns#4100)

e233f59

Signed-off-by: Hu Shuai <[email protected]>

auto go mod tidy

18c8e1a

sgreene570 mentioned this pull request Mar 2, 2021

NE-515: Alerts: Update prometheus alert rules for CoreDNS v1.8.z openshift/cluster-dns-operator#239

Merged

1 task

openshift-ci-robot assigned rfredette Mar 5, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2021

openshift-merge-robot merged commit 8a53aec into openshift:master Mar 6, 2021

smarterclayton mentioned this pull request Mar 6, 2021

Revert "NE-514: Rebase to upstream v1.8.1" #53

Closed

Miciah mentioned this pull request Mar 6, 2021

Give CoreDNS access to endpointslices openshift/cluster-dns-operator#244

Merged

sgreene570 mentioned this pull request Mar 8, 2021

Upstream #4430: Corrected detection of K8s minor version #54

Merged

cybertron mentioned this pull request Apr 9, 2021

Rebase to upstream 0.44.0 openshift/kubernetes-nmstate#189

Merged

cybertron mentioned this pull request May 5, 2021

Bug 1954309: Rebase to upstream 0.47.0 openshift/kubernetes-nmstate#191

Merged

rfredette mentioned this pull request Jun 15, 2021

NE-581: Rebase to upstream v1.8.4 #60

Merged

This was referenced Aug 27, 2021

Bug 1998208: Rebase to upstream 0.52.4 nmstate/kubernetes-nmstate#814

Closed

Bug 1998208: Rebase to upstream 0.52.4 openshift/kubernetes-nmstate#209

Merged

Miciah mentioned this pull request Jan 22, 2022

Bug 2043801: Merge 1.8.7 #70

Merged

Miciah mentioned this pull request May 26, 2022

Bug 2090827: Merge 1.9.2 #73

Merged

gcs278 mentioned this pull request Sep 27, 2022

OCPBUGS-1731: Merge 1.10.0 #76

Merged

gcs278 mentioned this pull request Feb 15, 2023

OCPBUGS-7558: Merge 1.10.1 #88

Merged

gcs278 mentioned this pull request Aug 8, 2023

OCPBUGS-13968: Merge 1.11.1 #93

Closed

gcs278 mentioned this pull request Aug 16, 2023

OCPBUGS-13968: Merge 1.11.1 #94

Merged

gcs278 mentioned this pull request May 9, 2024

NE-1721: Merge 1.11.3 #118

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NE-514: Rebase to upstream v1.8.1 #52

NE-514: Rebase to upstream v1.8.1 #52

sgreene570 commented Feb 22, 2021 •

edited

Loading

sgreene570 commented Mar 2, 2021

sgreene570 commented Mar 3, 2021

cybertron commented Mar 3, 2021

openshift-ci-robot commented Mar 3, 2021

rfredette commented Mar 5, 2021

openshift-ci-robot commented Mar 5, 2021

sgreene570 commented Mar 5, 2021

openshift-bot commented Mar 5, 2021

openshift-bot commented Mar 5, 2021

openshift-bot commented Mar 6, 2021

NE-514: Rebase to upstream v1.8.1 #52

NE-514: Rebase to upstream v1.8.1 #52

Conversation

sgreene570 commented Feb 22, 2021 • edited Loading

CoreDNS v1.8.1 rebase process

sgreene570 commented Mar 2, 2021

sgreene570 commented Mar 3, 2021

cybertron commented Mar 3, 2021

openshift-ci-robot commented Mar 3, 2021

rfredette commented Mar 5, 2021

openshift-ci-robot commented Mar 5, 2021

sgreene570 commented Mar 5, 2021

openshift-bot commented Mar 5, 2021

openshift-bot commented Mar 5, 2021

openshift-bot commented Mar 6, 2021

sgreene570 commented Feb 22, 2021 •

edited

Loading