Bug 2043801: Merge 1.8.7 #70
Conversation
-p is the default flag in DNS software for setting the port, we use 'dns.port' because of preventing clashes with other caddy software users. This is no longer an issue, so we can do what we want here. Add -p to works like -dns.port. (this PR includes generated manpage, but that shouldn't matter too much) Signed-off-by: Miek Gieben <[email protected]>
Signed-off-by: coredns[bot] <[email protected]>
* fix ipv6 case for cidr.Class Signed-off-by: Chris O'Haver <[email protected]> * add check and test case for invalid ipv6 cidr Signed-off-by: Chris O'Haver <[email protected]> * net package is bad at detecting ipv6/ipv4 Signed-off-by: Chris O'Haver <[email protected]> * rename Class -> Split Signed-off-by: Chris O'Haver <[email protected]>
Signed-off-by: Chris O'Haver <[email protected]>
Signed-off-by: Sven Nebel <[email protected]>
Signed-off-by: coredns[bot] <[email protected]>
…oredns#4678) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.26.0 to 0.28.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.26.0...v0.28.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd) from 3.5.0-beta.4 to 3.5.0-rc.0. - [Release notes](https://github.com/etcd-io/etcd/releases) - [Changelog](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.4.md) - [Commits](etcd-io/etcd@v3.5.0-beta.4...v3.5.0-rc.0) --- updated-dependencies: - dependency-name: go.etcd.io/etcd/client/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Licht Takeuchi <[email protected]>
This fixes the rendering of this README as html. The codeblock was closed with 4 ~, should be 3. Signed-off-by: Miek Gieben <[email protected]>
…s#4681) Our GitHub Actions CI is having some issues with `make -f Makefile.doc` as the related changes that should have triggered the build didn't work for the past 3 months (since march). This PR adds verbose to GitHub Actions CI to see if we can get more information. Note this PR just add `set -x` to show detailed step. Will not impact anything else. Signed-off-by: Yong Tang <[email protected]>
This PR will fix the issue of doc is not automated rendered through GitHub Actions anymore. It looks the issue is cause by the fact that in `fixup_file_mtime.sh` is only fixing files on source (.md) side, not on target (man/*.[1|5|7]) side. As a result Makefile will skip the rendering of doc as it assume everything will be update to date. This should fix the issue we were facing. Signed-off-by: Yong Tang <[email protected]>
Signed-off-by: coredns[bot] <[email protected]>
* retry initial transfer Signed-off-by: Chris O'Haver <[email protected]> * fix import grouping Signed-off-by: Chris O'Haver <[email protected]> * add test; use backoff timeout Signed-off-by: Chris O'Haver <[email protected]> * fix import order Signed-off-by: Chris O'Haver <[email protected]> * manual backoff Signed-off-by: Chris O'Haver <[email protected]>
Signed-off-by: Chris O'Haver <[email protected]>
Add retry behavior on startup and point to RFC 5936 Signed-off-by: Miek Gieben <[email protected]>
…a. (coredns#4696) Signed-off-by: Chris O'Haver <[email protected]>
Since we are using GitHub Actions in CoreDNS repo and we are already using Dependabot for security/version scans on golang code, it makes sense to enable security/version scans on GitHub Actions as well. Signed-off-by: Yong Tang <[email protected]>
|
Both "TestImportOrdering" and "TestReadme" fail for me when I run |
|
The "operator conditions network" test in e2e-metal-ipi failed: /test e2e-metal-ipi |
|
/hold |
|
@cybertron tells me that the mDNS plugin is no longer needed, so I am going to drop the following carry and revendor: |
Should be reevaluated next rebase. Co-authored-by: Ryan Fredette <[email protected]>
Disable dependabot in the openshift fork
Co-authored-by: AOS Automation Release Team <[email protected]> Co-authored-by: Justin Pierce <[email protected]> Co-authored-by: openshift-bot <[email protected]> Co-authored-by: openshift-ci-robot <[email protected]>
|
@Miciah: This pull request references Bugzilla bug 2043801, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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. |
|
@openshift-ci[bot]: GitHub didn't allow me to request PR reviews from the following users: ShudiLi. Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs. In response to this:
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. |
|
/retest |
/test e2e-aws-upgrade |
|
Lots and lots of failures... |
|
@Miciah: The following test failed, say
Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
|
https://prow.ci.openshift.org/job-history/gs/origin-ci-test/pr-logs/directory/pull-ci-openshift-coredns-master-e2e-metal-ipi shows that e2e-metal-ipi has never passed; it shouldn't hold up this PR. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: frobware, Miciah 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:
Approvers can indicate their approval by writing |
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
|
@Miciah: All pull requests linked via external trackers have merged: Bugzilla bug 2043801 has been moved to the MODIFIED state. In response to this:
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. |
Rebase to CoreDNS 1.8.7 so that we use the Kubernetes 1.23 API and client packages.
I made this PR using the same process as #52 and #60:
git remote updategit checkout v1.8.7git checkout -b merge-tmpgit checkout origin/masterecho 'merge coredns/coredns v1.8.7' | git commit-tree 'merge-tmp^{tree}' -p HEAD -p merge-tmp -F -git branch merge-1.8.7 ccbc66ea50b1d0b8af75b41c332ec15bf4853887git checkout merge-1.8.7git rev-list --reverse --no-merges 60ff4c4b5fa19044d71c6dc23424dc08ddbe8b37..origin/master | git cherry-pick --stdinMy merge commit from the above process was commit ccbc66e.
Before the rebase, we had the following carries:
The following commit had a merge conflict, and I noticed that it had drifted over the rebases:
The original commit from #14 inexplicably deleted a user at the same time that it added Red Hatters to the list of owners in
plugin/chaos/zowners.go. I rewrote the carry so it only adds Red Hatters.I combined the following commits:
I combined these commits into a single "Update builder images" commit, and updated to the Go 1.17 builder for compatibility with Kubernetes 1.23.
I also combined the following commits:
I combined these commits into a single "Add a product build pipeline Dockerfile" commit.
I also combined the following commits:
Upstream dropped
OWNERSin a recent release, so I combined these commits into a single "Add OWNERS" commit.I dropped the following commit because the mdns plugin is no longer needed in OpenShift (#70 (comment)):