Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 154 commits into from
Jun 28, 2021

Conversation

rfredette
Copy link

Created following the same process as #52

Process:

  1. Identify commits
$ git log --oneline --no-merges e769ec998b66457a687a426b21acf655318e21dd..openshift/master

where e769ec9 is the merge commit for the previous rebase

  1. Create merge commit with openshift/master and upstream v1.8.4 as parent commits
$ git remote update # make sure we update our refs
$ git checkout v1.8.4 # upstream CoreDNS 1.8.4 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.4' | git commit-tree merge-tmp^{tree} -p HEAD -p merge-tmp -F -
deadbeef12345678 # id of new merge commit
$ git branch merge-1.8.4 deadbeef12345678 # create a new branch for the cherry-pick work
$ git checkout merge-1.8.4 # make sure we are on the proper branch

The resulting merge commit is 60ff4c4

  1. Cherry pick all necessary commits identified in step 1
    Some commits that were local to this fork don't need to be kept in the rebase. All vendor/go.mod commits were squashed into one; several upstream commits that were manually ported to this fork are already in 1.8.4, so they were dropped.

The full list of dropped or squashed commits is:

16ad6d83e consider nil ready as ready (#4632) // Already present
1af208781 exclude unready endpoints from endpointslices (#4580) // Already present
1471195bb copy unready exclusion to v1beta1 func (#4616) // Already present
953245c3b plugin/kubernetes: Support both v1 and v1beta1 EndpointSlices (#4570) // Already present
20f79176b plugin/kubernetes: do endpoint/slice check in retry loop (#4492) // Already present
58a44df0d plugin/kubernetes: don't return when ServerVersion return an error (#4490) // Already present
0625b2d95 go.mod: Bump for kube 1.21 //Combined with other vendor/go.mod commits
532395b06 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/0c10ae924af72f1c759cf8b24b50de94c02e6268/images/coredns.yml //Combined with other ART image updates
4c1fe83a2 Corrected detection of K8s minor version (#4430) // Already present
ee930681b UPSTREAM: <carry>: openshift: Vendor required modules //Combined with other vendor/go.mod commits
e7d8e58f8 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 //Combined with other ART image updates
e27b1500e 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 //Combined with other ART image updates
960001974 UPSTREAM: <carry>: openshift: Add rfredette to OWNERS //Squashed into single OWNERS update
3f329badb UPSTREAM: <carry>: openshift: addowner-candita //Squashed into single OWNERS update
a4a0530cd 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 //Combined with other ART image updates
c6c6dabf7 UPSTREAM: <carry>: openshift: Update owners //Squashed into single OWNERS update

The final list of commits that were kept is (cherry-picked from bottom to top):

e9381fdaa UPSTREAM: <carry>: openshift: Vendor required modules
47ee30b73 UPSTREAM: <carry>: openshift: Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/0c10ae924af72f1c759cf8b24b50de94c02e6268/images/coredns.yml
124204b8b UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary 
5ee47a279 UPSTREAM: <carry>: openshift: Update owners
42a1d47e8 UPSTREAM: <carry>: openshift: Updating Dockerfile.openshift.rhel7 baseimages to mach ocp-build-data config
f653b08ce UPSTREAM: <carry>: openshift: OWNERS: Add component
ece651ac2 UPSTREAM: <carry>: openshift: Add github.com/openshift/coredns-mdns plugin
987941801 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
8ef04d79a UPSTREAM: <carry>: openshift: Set Dockerfiles to use vendor 
defc5c1e9 UPSTREAM: <carry>: openshift: Add a `make test` target
78dc38111 UPSTREAM: <carry>: openshift: Optimize COPY directive
a8cac43c4 UPSTREAM: <carry>: openshift: Add a RHEL7 Dockerfile and standardize format
2c53ec989 UPSTREAM: <carry>: openshift: Use multistage builds
225d3a35d UPSTREAM: <carry>: openshift: Update metadata 
66fcb277a UPSTREAM: <carry>: openshift: Add a product build pipeline Dockerfile 
6961254ef UPSTREAM: <carry>: openshift: Changed the OWNERS to OpenShift ones

chrisohaver and others added 30 commits January 21, 2021 09:59
…coredns#4391)

* plugin/forward Add rcode and rtype to request_duration_seconds metric

Signed-off-by: Maxime Ginters <[email protected]>

* Control the cardinality of query type

Signed-off-by: Maxime Ginters <[email protected]>
* Revert "make copies of RRs before returning them (coredns#4409)"

This reverts commit 8b2ff6c.

* Document copying responses

See coredns#4409 and the comments. This documents that issue, but doesn't
change the in-tree plugins just yet.

Signed-off-by: Miek Gieben <[email protected]>

* Update plugin.md

Co-authored-by: Chris O'Haver <[email protected]>

Co-authored-by: Chris O'Haver <[email protected]>
…#4421)

This commit replaces `manifest-tool` with `docker manifest`, which should
hopefully provide a better experience for releasing coredns.

In addition it integrates mips64le (since it's supported by `docker
manifest`) in LINUX_ARCHES, so docker images for mips64le are pushed as
well.

Signed-off-by: Manuel Rüger <[email protected]>
…oredns#4441)

Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.36.31 to 1.37.1.
- [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.36.31...v1.37.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
…#4442)

Bumps [github.com/miekg/dns](https://github.com/miekg/dns) from 1.1.35 to 1.1.37.
- [Release notes](https://github.com/miekg/dns/releases)
- [Changelog](https://github.com/miekg/dns/blob/master/Makefile.release)
- [Commits](miekg/dns@v1.1.35...v1.1.37)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Currently ACLs only allow for allow and block, however it isn't
always desirable to set the status code to REFUSED. Often times
you want to completely hide the fact that those records even exist.

Adding the ability to acl to filter results makes it significantly
harder for a third party to know that the records are being masked.

Signed-off-by: George Shammas <[email protected]>
Copy the msg to prevent messing with the (via the pointer) original
created message that may be stored in the cache or anything other data
store.

Signed-off-by: Miek Gieben <[email protected]>
* plugin/transfer: only allow outgoing axfr over tcp

Return refused when the query comes in over udp.
No need to add a new test case as the current crop needed to be changed
to use TCP.

Fixes: coredns#4450

Signed-off-by: Miek Gieben <[email protected]>

* transfer tests: this needs tcp as well

Signed-off-by: Miek Gieben <[email protected]>
* plugin/sign: track zone file's mtime

Resign if the original zone's mtime is change in some way.

Closes coredns#4407

Signed-off-by: Miek Gieben <[email protected]>

* Update plugin/sign/README.md

Co-authored-by: Chris O'Haver <[email protected]>

Co-authored-by: Yong Tang <[email protected]>
Co-authored-by: Chris O'Haver <[email protected]>
@sgreene570
Copy link

/retest

2 similar comments
@rfredette
Copy link
Author

/retest

@rfredette
Copy link
Author

/retest

@sgreene570
Copy link

/test e2e-aws

@sgreene570
Copy link

/refresh

@sgreene570
Copy link

/retest

3 similar comments
@rfredette
Copy link
Author

/retest

@rfredette
Copy link
Author

/retest

@rfredette
Copy link
Author

/retest

sgreene570 and others added 6 commits June 25, 2021 12:48
Add sgreene70, frobware, candita, rfredette, and alebedev87 to the
approvers section of the OWNERS file.
Add github.com/openshift/coredns-mdns

Should be reevaluated next rebase
…image` from openshift/release

This is an autogenerated PR that updates the `.ci-operator.yaml`
to reference the `build_root_image` found in the [ci-operator-config](https://github.com/openshift/release/tree/master/ci-operator/config)
in the [openshift/release](https://github.com/openshift/release) repository.

This is done in preparation for enabling reading the `build_root` from
your repository rather than the central config in [openshift/release](https://github.com/openshift/release).
This allows to update the `build_root` in lockstep with code changes. For details, please
refer to the [docs](https://docs.ci.openshift.org/docs/architecture/ci-operator/#build-root-image).

Note that enabling this feature is mandatory for all OCP components that have an ART build config.

A second autogenerated PR to the [openshift/release repository](https://github.com/openshift/release)
will enable reading the `build_root` from your repository once this PR was merged.

If you have any questions, please feel free to reach out in the #forum-testplatform
channel in the CoreOS Slack.
@openshift-ci
Copy link

openshift-ci bot commented Jun 25, 2021

@rfredette: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-metal-ipi 1bce8b2 link /test e2e-metal-ipi

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.

@rfredette
Copy link
Author

/retest

@sgreene570
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 28, 2021
@openshift-ci
Copy link

openshift-ci bot commented Jun 28, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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

@openshift-merge-robot openshift-merge-robot merged commit d73df8c into openshift:master Jun 28, 2021
@Miciah Miciah mentioned this pull request Jan 22, 2022
@Miciah Miciah mentioned this pull request May 26, 2022
@gcs278 gcs278 mentioned this pull request Sep 27, 2022
@gcs278 gcs278 mentioned this pull request Feb 15, 2023
@gcs278 gcs278 mentioned this pull request Aug 8, 2023
@gcs278 gcs278 mentioned this pull request May 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.