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

Bug 1801339: Rebase to upstream 1.6.6 #22

Merged

Conversation

bcrochet
Copy link
Member

The PR was created by first taking upstream/v1.6.6 (tag) as the base then applying UPSTREAM: <carry> patches on top. The set of patches applied was taken from:

$ git log --no-merges --format=oneline  v1.6.6..openshift/master  

To create the merge commit I have used the following steps:

$ git remote update
$ git checkout v1.6.6
$ git checkout -b merge
$ git checkout openshift/master
$ echo 'merge v1.6.6' | git commit-tree merge^{tree} -p HEAD -p merge
deadbeef12345678
$ git checkout deadbeef12345678
$ git cherry-pick ...all-the-things...
$ git checkout -b rebase-to-upstream-1.6.6

For details on the merge^{tree} syntax please read this documentation.

The result of git commit-tree in this PR is 0858c65

I then applied all the carry commits on top. Some patches were dropped, because they were referencing old vendored code, and Gopkg.*. A single vendor commit was created to be replaced in future rebases.

As we have not used this method prior, I have added the UPSTREAM: <carry>: openshift prefix to those commits that did not have this convention. This will make it easier to identify carry commits for the next rebase.

dependabot-preview bot and others added 30 commits August 12, 2019 18:26
Just building in master updates the deps.

Pushing this as a PR to get a clean build back.

Signed-off-by: Miek Gieben <[email protected]>
In the setup function use plugin.Error() to wrap the errors with the
plugin name. Because there isn't a separate setup() function this is
done for all returned errors.

Remove *upstream.Upstream from the New parameters as this is always set
and adjust the tests to account for this.

Signed-off-by: Miek Gieben <[email protected]>
Add notes for next release; azure was merged, nice to get that out, some
other bugfixes.

Signed-off-by: Miek Gieben <[email protected]>
format and simplify; highlighted some stuff in route53_test.go that
could be further simplified.

Signed-off-by: Miek Gieben <[email protected]>
Say a thing about 1.12.8 and HTTP/2

Signed-off-by: Miek Gieben <[email protected]>
Just minor textual cleanup.
Looks like there were some leftover in PR 3011 during
the merge conflict rebase. This PR removes the unneeded file
and fixed the plugin.cfg

Signed-off-by: Yong Tang <[email protected]>
…s#3138)

This PR adds some content in clouddns plugin to mention about
the fact that privately hosted zone does not need to attach to
a VPC.
Also change PROJECT_NAME to PROJECTT_ID, and reformt the markdown
to replace tab with 4 whitespace.

Signed-off-by: Yong Tang <[email protected]>
* plugin/clouddns: tiny fixes for the README

Did a post-merge review. Fix a few typos.

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

* Naming;

coredns -> CoreDNS
clouddns -> Cloud DNS
and italics then the plugin's name are mentioned.

Signed-off-by: Miek Gieben <[email protected]>
This feature introduce continuous fuzzing with the following
features:

* Ruzzing: fuzz-targets are run continuously on master
( the fuzzers are updated every time new code is pushed to master)
* Regresion: In addition to unit-tests travis runs all fuzz
targets through the generated corpus to catch bugs early  on
in the CI process before merge.
* Remove federation

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

* Rebuild and point to github.com/coredns/federation

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

* Export `localNodeName` => `LocalNodeName`, to be used by federation (until deprecation)

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

* Remove plugin/kubernetes/federation.go (=> kubernetes/federation repo)

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

* Update github.com/coredns/federation

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

* sticker-ci fix

Signed-off-by: Yong Tang <[email protected]>
Since we use golang 1.12 and gomod, it is not necessary
to match the impor path to `/go/src/github.com/coredns/coredns`
in order to build coredns. For that reason the build command
inside docker could be simplified with:
```
$ docker run --rm -i -t -v $PWD:/v -w /v golang:1.12 make
```

Signed-off-by: Yong Tang <[email protected]>
* fuzz: some cleanups

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

* smaller

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

* documentation

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

* comments

Signed-off-by: Miek Gieben <[email protected]>
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 22, 2020
@bcrochet
Copy link
Member Author

/assign @celebdor @ironcladlou @cybertron @frobware

@openshift-ci-robot
Copy link

@bcrochet: GitHub didn't allow me to assign the following users: cybertron, frobware, celebdor.

Note that only openshift members, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

/assign @celebdor @ironcladlou @cybertron @frobware

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.

@bcrochet
Copy link
Member Author

/cc @celebdor @cybertron @frobware

@openshift-ci-robot
Copy link

@bcrochet: GitHub didn't allow me to request PR reviews from the following users: celebdor, cybertron, frobware.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @celebdor @cybertron @frobware

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.

@bcrochet bcrochet force-pushed the rebase-to-upstream-1.6.6 branch from ca3b3ab to c36d112 Compare January 22, 2020 12:52
@bcrochet
Copy link
Member Author

[bcrochet@bcrochet coredns]$ podman build -f Dockerfile.openshift .
STEP 1: FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
STEP 2: WORKDIR /go/src/github.com/coredns/coredns
7aa3ab0b7f015a39852c43f1bf0eab23b0ff5df963fdf450745d3a929797f9aa
STEP 3: COPY . .
e6b1b53cfdfcb306883c59a3d26f3eb3d23ca39b7662012e126f39a264d35959
STEP 4: RUN GO111MODULE=on GOFLAGS=-mod=vendor go build -o coredns .
2020-01-22T13:15:00.000075137Z: cannot configure rootless cgroup using the cgroupfs manager
624b2b6237aacdfd5ee159494c3edcfa8f8da1499d9d1900521465affce77684
STEP 5: FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
STEP 6: COPY --from=builder /go/src/github.com/coredns/coredns/coredns /usr/bin/
921662387350668c821fe1ae819be0bf589caa8365a6b8fd433f8bc74333c9f1
STEP 7: ENTRYPOINT ["/usr/bin/coredns"]
0f9ebbf9eba179c7c7bc853d3c8ca7bdd18e8822f124fdd88cb85933bfaa91c8
STEP 8: LABEL io.k8s.display-name="CoreDNS" io.k8s.description="CoreDNS delivers the DNS and Discovery Service for a Kubernetes cluster." maintainer="[email protected]"
STEP 9: COMMIT
933249b1b8476284ceeaec18ca367c02b0eebe798bbfda5aacb8a1f7620ef887
933249b1b8476284ceeaec18ca367c02b0eebe798bbfda5aacb8a1f7620ef887

Image build is working locally.

@bcrochet
Copy link
Member Author

/retest

ironcladlou and others added 6 commits January 22, 2020 15:25
Previous coredns versions had a `make test` target and our ci-operator
currently uses this target to kick off the tests. So, at least to get
tests running against this PR without requiring changes to the
openshift/release ci-operator setup, I'm adding that target back.

This just runs the full litany of tests that Travis would run except
for the coverage targets and the tests that require a running etcd
server.
The coredns exclusion in .gitignore was ignoring anything that was named
coredns. This patch makes it specifically just the binary in the main dir.
…lugin

This plugin allows for discovering hosts via mDNS browsing, which
means that those nodes are then exposed via normal unicast DNS.
…esses with zone (coredns#3527)

1. The HostPortOrFile tests don't have any IPv6 tests. This adds some.
2. The HostPortOrFile breaks if any of the addresses have IPv6 zone
defined. ParseIP does not handle %zone anymore.

Signed-off-by: Brad P. Crochet <[email protected]>
@bcrochet bcrochet force-pushed the rebase-to-upstream-1.6.6 branch from b5ab269 to 358bd8f Compare January 22, 2020 15:33
@ironcladlou
Copy link

/approve

@ironcladlou
Copy link

/retest
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2020
@bcrochet
Copy link
Member Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit fde8a88 into openshift:master Jan 23, 2020
@russellb
Copy link
Member

@ironcladlou @bcrochet This PR included some fixes we need for IPv6. Do you want to propose a backport of the whole rebase? or cherry-pick the specific things needed for IPv6?

@ironcladlou
Copy link

I think we should backport the rebase to ease future backports, @bcrochet what do you think? Seems like it should merge cleanly?

@ironcladlou ironcladlou changed the title Rebase to upstream 1.6.6 Bug 1801339: Rebase to upstream 1.6.6 Feb 11, 2020
@openshift-ci-robot
Copy link

@bcrochet: All pull requests linked via external trackers have merged. Bugzilla bug 1801339 has been moved to the MODIFIED state.

In response to this:

Bug 1801339: Rebase to upstream 1.6.6

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.

@sgreene570 sgreene570 mentioned this pull request Feb 22, 2021
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.