OCPBUGS-7558: Merge 1.10.1 by gcs278 · Pull Request #88 · openshift/coredns

gcs278 · 2023-02-15T22:08:52Z

Rebased to CoreDNS 1.10.1

I made this PR using the same process as #76, #73, #52, #60, and #70:

git remote update
git checkout v1.10.1
git checkout -b merge-1.10.1-tmp
git checkout origin/master
echo 'merge coredns/coredns v1.10.1' | git commit-tree 'merge-1.10.1-tmp^{tree}' -p HEAD -p merge-1.10.1-tmp -F -
8b626bf76c57b2373ea1f897fb9d13e95d4f456d
git branch merge-1.10.1 8b626bf76c57b2373ea1f897fb9d13e95d4f456d
git checkout merge-1.10.1
git rev-list --reverse --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master | git cherry-pick --stdin
Note: ead3b6507d7bd2fc3e67b79d8ff0dff296396bac is the merge commit from the last merge OCPBUGS-1731: Merge 1.10.0 #76
My merge commit from the above process was commit 8b626bf

Before the rebase, we had the following commits:

git --no-pager log --oneline --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"
1b37b38eb UPSTREAM: <carry>: openshift: Disable dependabot
d922347b8 UPSTREAM: <carry>: openshift: Vendor required modules
785e85831 UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
d27bea2c2 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
a61557c4a UPSTREAM: <carry>: openshift: Add a `make test` target
c288614cf UPSTREAM: <carry>: openshift: Add product build config
d2a14b4f5 UPSTREAM: <carry>: openshift: Add OWNERS

I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit 1d2d4f767 UPSTREAM: <carry>: openshift: Vendor required modules.

I squashed/merged the following commit into the existing "Add product build config" commit:

d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml

I dropped the UDP Payload/Bufsize hardcoding fix commit because the hardcoding issues were resolved via coredns#5671:

47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.

I dropped wildcard-query support related carry patches as they were [deprecated in OCP 4.12]:(https://docs.openshift.com/container-platform/4.12/release_notes/ocp-4-12-release-notes.html#ocp-4-12-ne-deprecations):

b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"

No merge conflicts.

* bump golangci-lint with support of go 1.19 Signed-off-by: Ondřej Benkovský <ondrej.benkovsky@jamf.com> * remove deprecated usage of varcheck, deadcode, and structcheck Signed-off-by: Ondřej Benkovský <ondrej.benkovsky@jamf.com> Signed-off-by: Ondřej Benkovský <ondrej.benkovsky@jamf.com>

….0 (coredns#5636) Bumps [gopkg.in/DataDog/dd-trace-go.v1](https://github.com/DataDog/dd-trace-go) from 1.41.0 to 1.42.0. - [Release notes](https://github.com/DataDog/dd-trace-go/releases) - [Commits](DataDog/dd-trace-go@v1.41.0...v1.42.0) --- updated-dependencies: - dependency-name: gopkg.in/DataDog/dd-trace-go.v1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: Chris O'Haver <cohaver@infoblox.com> Signed-off-by: Chris O'Haver <cohaver@infoblox.com>

…#5639) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md) - [Commits](codecov/codecov-action@81cd2dc...d9f34f8) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>

….1 (coredns#5665) Bumps [gopkg.in/DataDog/dd-trace-go.v1](https://github.com/DataDog/dd-trace-go) from 1.42.0 to 1.42.1. - [Release notes](https://github.com/DataDog/dd-trace-go/releases) - [Commits](DataDog/dd-trace-go@v1.42.0...v1.42.1) --- updated-dependencies: - dependency-name: gopkg.in/DataDog/dd-trace-go.v1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…#5668) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.25 to 2.1.26. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@86f3159...e0e5ded) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…5667) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](ossf/scorecard-action@865b409...e363bfc) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…coredns#5664) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.105 to 1.44.109. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.105...v1.44.109) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* plugin/template : add support for extended DNS errors Signed-off-by: Ondřej Benkovský <ondrej.benkovsky@jamf.com>

Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.25.1 to 0.25.2. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](kubernetes/api@v0.25.1...v0.25.2) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…s#5663) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.97.0 to 0.98.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](googleapis/google-api-go-client@v0.97.0...v0.98.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…coredns#5675) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.109 to 1.44.114. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.109...v1.44.114) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ns#5676) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.49.0 to 1.50.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.49.0...v1.50.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 3.1.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...93ea575) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…#5678) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.26 to 2.1.27. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@e0e5ded...8075783) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

openshift-ci-robot · 2023-02-16T01:42:18Z

@gcs278: This pull request references Jira Issue OCPBUGS-7558, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.13.0) matches configured target version for branch (4.13.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @lihongan

Details

In response to this:

Rebased to CoreDNS 1.10.1

I made this PR using the same process as #76, #73, #52, #60, and #70:

git remote update

git checkout v1.10.1

git checkout -b merge-1.10.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.10.1' | git commit-tree 'merge-1.10.1-tmp^{tree}' -p HEAD -p merge-1.10.1-tmp -F -
8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git branch merge-1.10.1 8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git checkout merge-1.10.1

git rev-list --reverse --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master | git cherry-pick --stdin
Note: ead3b6507d7bd2fc3e67b79d8ff0dff296396bac is the merge commit from the last merge OCPBUGS-1731: Merge 1.10.0 #76

My merge commit from the above process was commit 8b626bf

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"
1b37b38eb UPSTREAM: <carry>: openshift: Disable dependabot
d922347b8 UPSTREAM: <carry>: openshift: Vendor required modules
785e85831 UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
d27bea2c2 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
a61557c4a UPSTREAM: <carry>: openshift: Add a `make test` target
c288614cf UPSTREAM: <carry>: openshift: Add product build config
d2a14b4f5 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit 1d2d4f767 UPSTREAM: <carry>: openshift: Vendor required modules.

I squashed/merged the following commit into the existing "Add product build config" commit:
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
I dropped the UDP Payload/Bufsize hardcoding fix commit because the hardcoding issues were resolved via coredns#5671:
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
I modified 912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)" for the test case to now check for RcodeNameError because of Miciah's RCode Rix in upstream (coredns#5657).

No merge conflicts.

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 · 2023-02-16T01:42:44Z

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: lihongan.

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

Details

In response to this:

@gcs278: This pull request references Jira Issue OCPBUGS-7558, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)

bug target version (4.13.0) matches configured target version for branch (4.13.0)

bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @lihongan
In response to this:
Rebased to CoreDNS 1.10.1

I made this PR using the same process as #76, #73, #52, #60, and #70:

git remote update

git checkout v1.10.1

git checkout -b merge-1.10.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.10.1' | git commit-tree 'merge-1.10.1-tmp^{tree}' -p HEAD -p merge-1.10.1-tmp -F -
8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git branch merge-1.10.1 8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git checkout merge-1.10.1

git rev-list --reverse --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master | git cherry-pick --stdin
Note: ead3b6507d7bd2fc3e67b79d8ff0dff296396bac is the merge commit from the last merge OCPBUGS-1731: Merge 1.10.0 #76

My merge commit from the above process was commit 8b626bf

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"
1b37b38eb UPSTREAM: <carry>: openshift: Disable dependabot
d922347b8 UPSTREAM: <carry>: openshift: Vendor required modules
785e85831 UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
d27bea2c2 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
a61557c4a UPSTREAM: <carry>: openshift: Add a `make test` target
c288614cf UPSTREAM: <carry>: openshift: Add product build config
d2a14b4f5 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit 1d2d4f767 UPSTREAM: <carry>: openshift: Vendor required modules.

I squashed/merged the following commit into the existing "Add product build config" commit:
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
I dropped the UDP Payload/Bufsize hardcoding fix commit because the hardcoding issues were resolved via coredns#5671:
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
I modified 912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)" for the test case to now check for RcodeNameError because of Miciah's RCode Rix in upstream (coredns#5657).

No merge conflicts.
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.

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.

gcs278 · 2023-02-16T01:43:15Z

TestExternal Unit Test Failed. I have since fixed test case https://github.com/openshift/coredns/pull/88/files#diff-da18049bd54614e58c58fe61a84e72300d8208c2290282f776101bf7c2bda876R35 that now produces the right RCode.

lihongan · 2023-02-16T02:52:08Z

/jira refresh

openshift-ci-robot · 2023-02-16T02:52:11Z

@lihongan: This pull request references Jira Issue OCPBUGS-7558, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.13.0) matches configured target version for branch (4.13.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @melvinjoseph86

Details

In response to this:

/jira refresh

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 · 2023-02-16T02:52:14Z

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: melvinjoseph86.

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

Details

In response to this:

@lihongan: This pull request references Jira Issue OCPBUGS-7558, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)

bug target version (4.13.0) matches configured target version for branch (4.13.0)

bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @melvinjoseph86

In response to this:

/jira refresh

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.

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.

melvinjoseph86 · 2023-02-16T07:55:47Z

Verified using pre merge image
melvinjoseph@mjoseph-mac Downloads % oc get clusterversion
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
version 4.13.0-0.ci.test-2023-02-16-051433-ci-ln-m7fzss2-latest True False 119m Cluster version is 4.13.0-0.ci.test-2023-02-16-051433-ci-ln-m7fzss2-latest

melvinjoseph@mjoseph-mac Downloads % oc exec $(oc get pods -n openshift-dns --no-headers | awk '{print $1}' | head -1) -n openshift-dns -c dns -- bash -c "/usr/bin/coredns --version"
oc get co
CoreDNS-1.10.1
linux/amd64, go1.19.4,

melvinjoseph86 · 2023-02-16T07:55:58Z

/label qe-approved

gcs278 · 2023-02-16T20:09:22Z

Update: Dropped Wildcard support per release notes in 4.12 stating they are officially deprecated: https://docs.openshift.com/container-platform/4.12/release_notes/ocp-4-12-release-notes.html#ocp-4-12-ne-deprecations

openshift-ci-robot · 2023-02-16T20:11:37Z

@gcs278: This pull request references Jira Issue OCPBUGS-7558, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.13.0) matches configured target version for branch (4.13.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @melvinjoseph86

Details

In response to this:

Rebased to CoreDNS 1.10.1

I made this PR using the same process as #76, #73, #52, #60, and #70:

git remote update

git checkout v1.10.1

git checkout -b merge-1.10.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.10.1' | git commit-tree 'merge-1.10.1-tmp^{tree}' -p HEAD -p merge-1.10.1-tmp -F -
8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git branch merge-1.10.1 8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git checkout merge-1.10.1

git rev-list --reverse --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master | git cherry-pick --stdin
Note: ead3b6507d7bd2fc3e67b79d8ff0dff296396bac is the merge commit from the last merge OCPBUGS-1731: Merge 1.10.0 #76

My merge commit from the above process was commit 8b626bf

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"
1b37b38eb UPSTREAM: <carry>: openshift: Disable dependabot
d922347b8 UPSTREAM: <carry>: openshift: Vendor required modules
785e85831 UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
d27bea2c2 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
a61557c4a UPSTREAM: <carry>: openshift: Add a `make test` target
c288614cf UPSTREAM: <carry>: openshift: Add product build config
d2a14b4f5 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit 1d2d4f767 UPSTREAM: <carry>: openshift: Vendor required modules.

I squashed/merged the following commit into the existing "Add product build config" commit:
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
I dropped the UDP Payload/Bufsize hardcoding fix commit because the hardcoding issues were resolved via coredns#5671:
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
I dropped wildcard-query support related carry patches as they were [deprecated in OCP 4.12]:(https://docs.openshift.com/container-platform/4.12/release_notes/ocp-4-12-release-notes.html#ocp-4-12-ne-deprecations):
b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"
No merge conflicts.

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 · 2023-02-16T20:12:09Z

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: melvinjoseph86.

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

Details

In response to this:

@gcs278: This pull request references Jira Issue OCPBUGS-7558, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)

bug target version (4.13.0) matches configured target version for branch (4.13.0)

bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @melvinjoseph86
In response to this:
Rebased to CoreDNS 1.10.1

I made this PR using the same process as #76, #73, #52, #60, and #70:

git remote update

git checkout v1.10.1

git checkout -b merge-1.10.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.10.1' | git commit-tree 'merge-1.10.1-tmp^{tree}' -p HEAD -p merge-1.10.1-tmp -F -
8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git branch merge-1.10.1 8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git checkout merge-1.10.1

git rev-list --reverse --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master | git cherry-pick --stdin
Note: ead3b6507d7bd2fc3e67b79d8ff0dff296396bac is the merge commit from the last merge OCPBUGS-1731: Merge 1.10.0 #76

My merge commit from the above process was commit 8b626bf

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"
1b37b38eb UPSTREAM: <carry>: openshift: Disable dependabot
d922347b8 UPSTREAM: <carry>: openshift: Vendor required modules
785e85831 UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
d27bea2c2 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
a61557c4a UPSTREAM: <carry>: openshift: Add a `make test` target
c288614cf UPSTREAM: <carry>: openshift: Add product build config
d2a14b4f5 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit 1d2d4f767 UPSTREAM: <carry>: openshift: Vendor required modules.

I squashed/merged the following commit into the existing "Add product build config" commit:
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
I dropped the UDP Payload/Bufsize hardcoding fix commit because the hardcoding issues were resolved via coredns#5671:
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
I dropped wildcard-query support related carry patches as they were [deprecated in OCP 4.12]:(https://docs.openshift.com/container-platform/4.12/release_notes/ocp-4-12-release-notes.html#ocp-4-12-ne-deprecations):
b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"
No merge conflicts.
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.

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 · 2023-02-16T22:48:54Z

@gcs278: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

cybertron · 2023-02-17T17:06:59Z

/lgtm

metal-ipi passed so it looks like we're good with this change.

openshift-ci · 2023-02-17T17:07:01Z

@cybertron: changing LGTM is restricted to collaborators

Details

In response to this:

/lgtm

metal-ipi passed so it looks like we're good with this change.

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.

Miciah · 2023-02-20T06:48:32Z

/lgtm
/approve

openshift-ci · 2023-02-20T06:48:49Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [Miciah]

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

openshift-ci-robot · 2023-02-20T06:51:37Z

@gcs278: All pull requests linked via external trackers have merged:

openshift/coredns#88

Jira Issue OCPBUGS-7558 has been moved to the MODIFIED state.

Details

In response to this:

Rebased to CoreDNS 1.10.1

I made this PR using the same process as #76, #73, #52, #60, and #70:

git remote update

git checkout v1.10.1

git checkout -b merge-1.10.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.10.1' | git commit-tree 'merge-1.10.1-tmp^{tree}' -p HEAD -p merge-1.10.1-tmp -F -
8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git branch merge-1.10.1 8b626bf76c57b2373ea1f897fb9d13e95d4f456d

git checkout merge-1.10.1

git rev-list --reverse --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master | git cherry-pick --stdin
Note: ead3b6507d7bd2fc3e67b79d8ff0dff296396bac is the merge commit from the last merge OCPBUGS-1731: Merge 1.10.0 #76

My merge commit from the above process was commit 8b626bf

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges ead3b6507d7bd2fc3e67b79d8ff0dff296396bac..origin/master
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"
1b37b38eb UPSTREAM: <carry>: openshift: Disable dependabot
d922347b8 UPSTREAM: <carry>: openshift: Vendor required modules
785e85831 UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
d27bea2c2 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
a61557c4a UPSTREAM: <carry>: openshift: Add a `make test` target
c288614cf UPSTREAM: <carry>: openshift: Add product build config
d2a14b4f5 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit 1d2d4f767 UPSTREAM: <carry>: openshift: Vendor required modules.

I squashed/merged the following commit into the existing "Add product build config" commit:
d18012ca2 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ef52fa34ff45201392333743c99c4b25b52fe724/images/coredns.yml
fce0690b1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/b44f15ec9e84d1831eac81f8c757b3bed985dbeb/images/coredns.yml
I dropped the UDP Payload/Bufsize hardcoding fix commit because the hardcoding issues were resolved via coredns#5671:
47040eaf9 UPSTREAM: <carry>: openshift: Remove UDP Payload size hardcoding to 2048 on cache upstream refreshes. Don't override EDNS0 OPT RR, created by the bufsize plugin. Also, set default upstream UDP Payload to 512 if EDNS0 OPT RR doesn't exist.
I dropped wildcard-query support related carry patches as they were [deprecated in OCP 4.12]:(https://docs.openshift.com/container-platform/4.12/release_notes/ocp-4-12-release-notes.html#ocp-4-12-ne-deprecations):
b912bfdb7 UPSTREAM: <carry>: openshift: Revert "Revert "add wildcard warnings (#5030)" (#5167)"
912fc2628 UPSTREAM: <carry>: openshift: Revert "remove wildcard query functionality (#5019)"
No merge conflicts.

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.

OCPBUGS-7558: Merge 1.10.1

Ondřej Benkovský and others added 30 commits September 19, 2022 05:53

build(deps): bump k8s.io/apimachinery from 0.25.0 to 0.25.1 (coredns#…

8a6821c

…5628)

build(deps): bump github/codeql-action from 2.1.22 to 2.1.24 (coredns…

3a0d5f6

…#5634)

build(deps): bump ossf/scorecard-action from 1.1.2 to 2.0.3 (coredns#…

d7ca760

…5633)

build(deps): bump github.com/aws/aws-sdk-go from 1.44.95 to 1.44.100 (c…

7304cd1

…oredns#5635)

build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.4 to 3.5.5 (core…

7483737

…dns#5629)

build(deps): bump google.golang.org/api from 0.95.0 to 0.96.0 (coredn…

796ab92

…s#5631)

build(deps): bump k8s.io/api from 0.25.0 to 0.25.1 (coredns#5632)

9f3a2e2

add id-token: write (coredns#5637)

ba6ebbd

Signed-off-by: Chris O'Haver <cohaver@infoblox.com> Signed-off-by: Chris O'Haver <cohaver@infoblox.com>

Update 1.9.4 note to included missed author and entries (coredns#5638)

99098ef

build(deps): bump github.com/aws/aws-sdk-go from 1.44.100 to 1.44.105 (…

d5f1c69

…coredns#5648)

build(deps): bump google.golang.org/api from 0.96.0 to 0.97.0 (coredn…

da4436e

…s#5649)

build(deps): bump k8s.io/apimachinery from 0.25.1 to 0.25.2 (coredns#…

c15686a

…5650)

build(deps): bump github.com/matttproud/golang_protobuf_extensions (c…

d4b566f

…oredns#5651)

build(deps): bump github/codeql-action from 2.1.24 to 2.1.25 (coredns…

cbe8125

…#5654)

build(deps): bump actions/dependency-review-action from 2.1.0 to 2.4.0 (

4ba4969

coredns#5653)

add members (coredns#5655)

3c60348

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>

plugin/template : add support for extended DNS errors (coredns#5659)

2fa9821

* plugin/template : add support for extended DNS errors Signed-off-by: Ondřej Benkovský <ondrej.benkovsky@jamf.com>

gcs278 force-pushed the merge-1.10.1 branch from 64a383f to 420b2a5 Compare February 16, 2023 01:38

openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Feb 16, 2023

gcs278 force-pushed the merge-1.10.1 branch from 420b2a5 to 433d377 Compare February 16, 2023 20:07

openshift-ci-robot added the jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. label Feb 16, 2023

openshift-ci Bot assigned Miciah Feb 20, 2023

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2023

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 20, 2023

openshift-merge-robot merged commit 5560e4a into openshift:master Feb 20, 2023

alebedev87 mentioned this pull request Apr 4, 2023

OCPBUGS-6296: Address CVE-2022-41717 #87

Closed

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

bentito pushed a commit to bentito/coredns that referenced this pull request Nov 21, 2025

Merge pull request openshift#88 from gcs278/merge-1.10.1

1ca3dac

OCPBUGS-7558: Merge 1.10.1

Conversation

gcs278 commented Feb 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Feb 16, 2023

Uh oh!

openshift-ci Bot commented Feb 16, 2023

Uh oh!

gcs278 commented Feb 16, 2023

Uh oh!

lihongan commented Feb 16, 2023

Uh oh!

openshift-ci-robot commented Feb 16, 2023

Uh oh!

openshift-ci Bot commented Feb 16, 2023

Uh oh!

melvinjoseph86 commented Feb 16, 2023

Uh oh!

melvinjoseph86 commented Feb 16, 2023

Uh oh!

gcs278 commented Feb 16, 2023

Uh oh!

openshift-ci-robot commented Feb 16, 2023

Uh oh!

openshift-ci Bot commented Feb 16, 2023

Uh oh!

openshift-ci Bot commented Feb 16, 2023

Uh oh!

cybertron commented Feb 17, 2023

Uh oh!

openshift-ci Bot commented Feb 17, 2023

Uh oh!

Miciah commented Feb 20, 2023

Uh oh!

openshift-ci Bot commented Feb 20, 2023

Uh oh!

openshift-ci-robot commented Feb 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

gcs278 commented Feb 15, 2023 •

edited

Loading