OCPBUGS-13968: Merge 1.11.1 #93

gcs278 · 2023-08-08T17:23:49Z

Rebased to CoreDNS 1.11.1 (note branch is called merge-1.11.0 due to originally starting with 1.11.0 and a major regression coredns#6255 caused a version bump)

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

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

Before the rebase, we had the following commits:

git --no-pager log --oneline --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master
48a49554b OCPBUGS-12494: Address CVE-2022-41723
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
433d377a9 UPSTREAM: <carry>: openshift: Disable dependabot
bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules
69fc73eac UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
279951d92 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
6455c7589 UPSTREAM: <carry>: openshift: Add a `make test` target
99b2d5976 UPSTREAM: <carry>: openshift: Add product build config
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS

I edited the Add OWNERS commit to drop employees no longer with the company (smarterclayton, ironcladlou, sgreene570, danehans):

53e672268 UPSTREAM: <carry>: openshift: Add OWNERS

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

2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml

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

I dropped the CVE-2022-41723 fix commit because upstream CoreDNS already had bumped the x/net modules > 0.7.0:

48a49554b OCPBUGS-12494: Address CVE-2022-41723

No merge conflicts (other than 48a49554b OCPBUGS-12494: Address CVE-2022-41723 which was dropped).

Signed-off-by: Fish-pro <[email protected]>

…coredns#5921) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.194 to 1.44.199. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.194...v1.44.199) --- 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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…dns#5919) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.9.0 to 0.9.1. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@cff3e9a...8bd2f9f) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action 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>

) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.2.1 to 2.2.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@3ebbd71...17573ee) --- updated-dependencies: - dependency-name: github/codeql-action 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>

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/golang/sys/releases) - [Commits](golang/sys@v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: golang.org/x/sys 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>

…ns#5922) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.52.3 to 1.53.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.52.3...v1.53.0) --- updated-dependencies: - dependency-name: google.golang.org/grpc 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>

) Signed-off-by: Fish-pro <[email protected]>

Don't lock weights for duration of parsing weight file. Add missing check to reject zero weight values. Signed-off-by: Gabor Dozsa <[email protected]>

Signed-off-by: Lionello Lunesu <[email protected]>

Signed-off-by: Chris O'Haver <[email protected]>

…coredns#5927)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.5.0 to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](golang/net@v0.5.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…oredns#5926) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.39.0 to 0.40.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.39.0...v0.40.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>

Signed-off-by: dmachard <[email protected]>

….0 (coredns#5935)

)

This change avoids the hard coding of HTTPS, allowing flexibility in whether HTTP or HTTPS is used. Signed-off-by: Sebastian Dahlgren <[email protected]>

Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.6.0 to 0.7.0. - [Release notes](https://github.com/golang/crypto/releases) - [Commits](golang/crypto@v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto 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 [k8s.io/api](https://github.com/kubernetes/api) from 0.26.1 to 0.26.2. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](kubernetes/api@v0.26.1...v0.26.2) --- updated-dependencies: - dependency-name: k8s.io/api 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>

…coredns#5948) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.209 to 1.44.214. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.209...v1.44.214) --- 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] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…dns#5960) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.110.0 to 0.112.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.110.0...v0.112.0) --- updated-dependencies: - dependency-name: google.golang.org/api 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>

…oredns#5961) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.40.0 to 0.42.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.40.0...v0.42.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>

…dns#5962) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.9.1 to 0.9.2. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@8bd2f9f...1f0aa58) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action 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>

) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.2.5 to 2.2.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@32dc499...16964e9) --- updated-dependencies: - dependency-name: github/codeql-action 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>

rfredette · 2023-08-14T15:37:30Z

/lgtm

coredns#6269) Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.0.6 to 3.0.7. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](actions/dependency-review-action@1360a34...7d90b4f) --- updated-dependencies: - dependency-name: actions/dependency-review-action 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>

* dnstap: add 'extra' field Signed-off-by: chenyuheng <[email protected]> * dnstap: add setup_test for 'extra' field Signed-off-by: chenyuheng <[email protected]> * udnstap: update document and test Signed-off-by: chenyuheng <[email protected]> * dnstap: update setup_test for more coverage Signed-off-by: chenyuheng <[email protected]> * dnstap: add TapMessageWithMetadata function to Dnstap Signed-off-by: chenyuheng <[email protected]> * dnstap: adapt dnstap and forward plugins to use TapMessageWithMetadata Signed-off-by: chenyuheng <[email protected]> * change TapMessageWithMetadata function Signed-off-by: chenyuheng <[email protected]> * tab inconsistency fix Signed-off-by: chenyuheng <[email protected]> * fix replacer to support empty state Signed-off-by: chenyuheng <[email protected]> * add replacer test for empty status parameter Signed-off-by: chenyuheng <[email protected]> * dnstap: update unit test for 'extra' field Signed-off-by: chenyuheng <[email protected]> * clean up code Signed-off-by: chenyuheng <[email protected]> * gofmt fix & static analysis fix Signed-off-by: chenyuheng <[email protected]> * dnstap: refactor Signed-off-by: chenyuheng <[email protected]> --------- Signed-off-by: chenyuheng <[email protected]>

Miciah · 2023-08-14T18:06:36Z

/hold
@gcs278 pointed out to me multiple recent reports of a potential regression that could impact our customers. Between coredns#6151 and coredns#6255, I count 5 people reporting very high CPU usage with CoreDNS 1.11.0. All 5 reporters say they are using TLS forwarding, 4 of them say they are using Cloudflare, 3 of them say they have the cache plugin, and there are no other plugins that are enabled in all the configs that reporters have posted at the time of this writing. We do have an option in OpenShift to configure TLS forwarding, and customers could very well have Cloudflare as an upstream, so it seems likely that we could have customers who would be affected by this regression. My opinion is that we should not do the bump now because there is too great a risk of a regression that could affect customers.

If the regression is identified and fixed quickly, we may still be able to bump to CoreDNS 1.11.z with the regression fixed after OpenShift's branch cut and backport CoreDNS 1.11.z to OCP 4.14.0.

…sponses (coredns#6014)" (coredns#6270) This reverts commit 604a902.

* bump version; add notes Signed-off-by: Chris O'Haver <[email protected]> --------- Signed-off-by: Chris O'Haver <[email protected]>

Add an OWNERS file so that we can maintain this fork. Co-authored-by: Andrey Lebedev <[email protected]> Co-authored-by: Benjamin Bennett <[email protected]> Co-authored-by: Miciah Dashiel Butler Masters <[email protected]> Co-authored-by: Stephen Greene <[email protected]> Co-authored-by: Grant Spence <[email protected]>

Add Dockerfiles and .ci-operator.yaml. Co-authored-by: Antoni Segura Puimedon <[email protected]> Co-authored-by: Dan Mace <[email protected]> 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]> Modified-by: Grant Spence <[email protected]>

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.

Should be reevaluated next rebase. Co-authored-by: Ryan Fredette <[email protected]> Modified-by: Grant Spence <[email protected]>

Disable dependabot in the openshift fork

openshift-ci · 2023-08-16T03:10:25Z

New changes are detected. LGTM label has been removed.

gcs278 · 2023-08-16T03:13:25Z

This PR has been updated to bump to the recent CoreDNS release: https://github.com/openshift/coredns/compare/5e4ed46991a3def20498204ab3934752f3a9f7cd..5378301acc7b854e1e7d4f84ddf04601d471a8a7

openshift-ci-robot · 2023-08-16T03:16:22Z

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

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @ShudiLi

In response to this:

Rebased to CoreDNS 1.11.1

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

git remote update

git checkout v1.11.1

git checkout -b merge-1.11.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.11.1' | git commit-tree 'merge-1.11.1-tmp^{tree}' -p HEAD -p merge-1.11.1-tmp -F -
a63105089cf042df50b79c6ff4145aee7af2f83b

git branch merge-1.11.1 a63105089cf042df50b79c6ff4145aee7af2f83b

git checkout merge-1.11.1

git rev-list --reverse --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master | git cherry-pick --stdin
Note: 8b626bf76c57b2373ea1f897fb9d13e95d4f456d is the merge commit from the last merge OCPBUGS-7558: Merge 1.10.1 #88

My merge commit from the above process was commit a631050

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master
48a49554b OCPBUGS-12494: Address CVE-2022-41723
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
433d377a9 UPSTREAM: <carry>: openshift: Disable dependabot
bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules
69fc73eac UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
279951d92 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
6455c7589 UPSTREAM: <carry>: openshift: Add a `make test` target
99b2d5976 UPSTREAM: <carry>: openshift: Add product build config
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the Add OWNERS commit to drop employees no longer with the company (smarterclayton, ironcladlou, sgreene570, danehans):
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I squashed/merged the following commit into the existing "Add product build config" commit:
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules.

I dropped the CVE-2022-41723 fix commit because upstream CoreDNS already had bumped the x/net modules > 0.7.0:
48a49554b OCPBUGS-12494: Address CVE-2022-41723
No merge conflicts (other than 48a49554b OCPBUGS-12494: Address CVE-2022-41723 which was dropped).

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-08-16T03:16:25Z

@openshift-ci-robot: 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:

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

3 validation(s) were run on this bug

bug is open, matching expected state (open)

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

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

Requesting review from QA contact:
/cc @ShudiLi
In response to this:
Rebased to CoreDNS 1.11.1

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

git remote update

git checkout v1.11.1

git checkout -b merge-1.11.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.11.1' | git commit-tree 'merge-1.11.1-tmp^{tree}' -p HEAD -p merge-1.11.1-tmp -F -
a63105089cf042df50b79c6ff4145aee7af2f83b

git branch merge-1.11.1 a63105089cf042df50b79c6ff4145aee7af2f83b

git checkout merge-1.11.1

git rev-list --reverse --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master | git cherry-pick --stdin
Note: 8b626bf76c57b2373ea1f897fb9d13e95d4f456d is the merge commit from the last merge OCPBUGS-7558: Merge 1.10.1 #88

My merge commit from the above process was commit a631050

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master
48a49554b OCPBUGS-12494: Address CVE-2022-41723
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
433d377a9 UPSTREAM: <carry>: openshift: Disable dependabot
bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules
69fc73eac UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
279951d92 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
6455c7589 UPSTREAM: <carry>: openshift: Add a `make test` target
99b2d5976 UPSTREAM: <carry>: openshift: Add product build config
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the Add OWNERS commit to drop employees no longer with the company (smarterclayton, ironcladlou, sgreene570, danehans):
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I squashed/merged the following commit into the existing "Add product build config" commit:
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules.

I dropped the CVE-2022-41723 fix commit because upstream CoreDNS already had bumped the x/net modules > 0.7.0:
48a49554b OCPBUGS-12494: Address CVE-2022-41723
No merge conflicts (other than 48a49554b OCPBUGS-12494: Address CVE-2022-41723 which was dropped).
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-robot · 2023-08-16T03:19:32Z

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

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @ShudiLi

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Rebased to CoreDNS 1.11.1 (note branch is called merge-1.11.0 due to originally starting with 1.11.0 and a major regression coredns#6255 caused a version bump)

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

git remote update

git checkout v1.11.1

git checkout -b merge-1.11.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.11.1' | git commit-tree 'merge-1.11.1-tmp^{tree}' -p HEAD -p merge-1.11.1-tmp -F -
a63105089cf042df50b79c6ff4145aee7af2f83b

git branch merge-1.11.1 a63105089cf042df50b79c6ff4145aee7af2f83b

git checkout merge-1.11.1

git rev-list --reverse --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master | git cherry-pick --stdin
Note: 8b626bf76c57b2373ea1f897fb9d13e95d4f456d is the merge commit from the last merge OCPBUGS-7558: Merge 1.10.1 #88

My merge commit from the above process was commit a631050

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master
48a49554b OCPBUGS-12494: Address CVE-2022-41723
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
433d377a9 UPSTREAM: <carry>: openshift: Disable dependabot
bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules
69fc73eac UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
279951d92 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
6455c7589 UPSTREAM: <carry>: openshift: Add a `make test` target
99b2d5976 UPSTREAM: <carry>: openshift: Add product build config
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the Add OWNERS commit to drop employees no longer with the company (smarterclayton, ironcladlou, sgreene570, danehans):
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I squashed/merged the following commit into the existing "Add product build config" commit:
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules.

I dropped the CVE-2022-41723 fix commit because upstream CoreDNS already had bumped the x/net modules > 0.7.0:
48a49554b OCPBUGS-12494: Address CVE-2022-41723
No merge conflicts (other than 48a49554b OCPBUGS-12494: Address CVE-2022-41723 which was dropped).

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-08-16T03:19:34Z

@openshift-ci-robot: 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:

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

3 validation(s) were run on this bug

bug is open, matching expected state (open)

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

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

Requesting review from QA contact:
/cc @ShudiLi

The bug has been updated to refer to the pull request using the external bug tracker.
In response to this:
Rebased to CoreDNS 1.11.1 (note branch is called merge-1.11.0 due to originally starting with 1.11.0 and a major regression coredns#6255 caused a version bump)

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

git remote update

git checkout v1.11.1

git checkout -b merge-1.11.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.11.1' | git commit-tree 'merge-1.11.1-tmp^{tree}' -p HEAD -p merge-1.11.1-tmp -F -
a63105089cf042df50b79c6ff4145aee7af2f83b

git branch merge-1.11.1 a63105089cf042df50b79c6ff4145aee7af2f83b

git checkout merge-1.11.1

git rev-list --reverse --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master | git cherry-pick --stdin
Note: 8b626bf76c57b2373ea1f897fb9d13e95d4f456d is the merge commit from the last merge OCPBUGS-7558: Merge 1.10.1 #88

My merge commit from the above process was commit a631050

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master
48a49554b OCPBUGS-12494: Address CVE-2022-41723
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
433d377a9 UPSTREAM: <carry>: openshift: Disable dependabot
bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules
69fc73eac UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
279951d92 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
6455c7589 UPSTREAM: <carry>: openshift: Add a `make test` target
99b2d5976 UPSTREAM: <carry>: openshift: Add product build config
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the Add OWNERS commit to drop employees no longer with the company (smarterclayton, ironcladlou, sgreene570, danehans):
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I squashed/merged the following commit into the existing "Add product build config" commit:
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules.

I dropped the CVE-2022-41723 fix commit because upstream CoreDNS already had bumped the x/net modules > 0.7.0:
48a49554b OCPBUGS-12494: Address CVE-2022-41723
No merge conflicts (other than 48a49554b OCPBUGS-12494: Address CVE-2022-41723 which was dropped).
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-08-16T03:23:16Z

Since I can't change the branch name from merge-1.11.1, and the branch name shows up in the merge commit, closing for #94
/close

openshift-ci · 2023-08-16T03:23:19Z

@gcs278: Closed this PR.

In response to this:

Since I can't change the branch name from merge-1.11.1, and the branch name shows up in the merge commit, closing for #94
/close

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-robot · 2023-08-16T03:23:21Z

@gcs278: This pull request references Jira Issue OCPBUGS-13968. The bug has been updated to no longer refer to the pull request using the external bug tracker.

In response to this:

Rebased to CoreDNS 1.11.1 (note branch is called merge-1.11.0 due to originally starting with 1.11.0 and a major regression coredns#6255 caused a version bump)

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

git remote update

git checkout v1.11.1

git checkout -b merge-1.11.1-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.11.1' | git commit-tree 'merge-1.11.1-tmp^{tree}' -p HEAD -p merge-1.11.1-tmp -F -
a63105089cf042df50b79c6ff4145aee7af2f83b

git branch merge-1.11.1 a63105089cf042df50b79c6ff4145aee7af2f83b

git checkout merge-1.11.1

git rev-list --reverse --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master | git cherry-pick --stdin
Note: 8b626bf76c57b2373ea1f897fb9d13e95d4f456d is the merge commit from the last merge OCPBUGS-7558: Merge 1.10.1 #88

My merge commit from the above process was commit a631050

Before the rebase, we had the following commits:
git --no-pager log --oneline --no-merges 8b626bf76c57b2373ea1f897fb9d13e95d4f456d..origin/master
48a49554b OCPBUGS-12494: Address CVE-2022-41723
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
433d377a9 UPSTREAM: <carry>: openshift: Disable dependabot
bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules
69fc73eac UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
279951d92 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
6455c7589 UPSTREAM: <carry>: openshift: Add a `make test` target
99b2d5976 UPSTREAM: <carry>: openshift: Add product build config
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I edited the Add OWNERS commit to drop employees no longer with the company (smarterclayton, ironcladlou, sgreene570, danehans):
53e672268 UPSTREAM: <carry>: openshift: Add OWNERS
I squashed/merged the following commit into the existing "Add product build config" commit:
2c776fc84 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/7575d251c23bb6784e1f762f3566c2770b051097/images/coredns.yml
20fb775c1 Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/e18d948b6ec9fc99c368102cffc1eea0c01f5765/images/coredns.yml
I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy and amended commit bc4b0e6f0 UPSTREAM: <carry>: openshift: Vendor required modules.

I dropped the CVE-2022-41723 fix commit because upstream CoreDNS already had bumped the x/net modules > 0.7.0:
48a49554b OCPBUGS-12494: Address CVE-2022-41723
No merge conflicts (other than 48a49554b OCPBUGS-12494: Address CVE-2022-41723 which was dropped).

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.

Fish-pro and others added 30 commits February 9, 2023 12:29

Use http constants instead of string (coredns#5908)

039a4d8

Signed-off-by: Fish-pro <[email protected]>

fix typo for log output (coredns#5909)

1b001ec

Signed-off-by: Fish-pro <[email protected]>

Close the body after reading the response body information (coredns#5907

156da74

) Signed-off-by: Fish-pro <[email protected]>

plugin/loadbalance: Improve weights update (coredns#5906)

52f1c64

Don't lock weights for duration of parsing weight file. Add missing check to reject zero weight values. Signed-off-by: Gabor Dozsa <[email protected]>

build: cp Dockerfile in docker-build target (coredns#5925)

ad623eb

Signed-off-by: Lionello Lunesu <[email protected]>

send notifies after adding zones all zones (coredns#5774)

77c7c0b

Signed-off-by: Chris O'Haver <[email protected]>

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

fa76615

…coredns#5927)

dnstap tls support (coredns#5917)

83fc3bb

Signed-off-by: dmachard <[email protected]>

build(deps): bump google.golang.org/api from 0.109.0 to 0.110.0 (core…

915b74f

…dns#5928)

build(deps): bump gopkg.in/DataDog/dd-trace-go.v1 from 1.47.0 to 1.48…

e82d8ed

….0 (coredns#5935)

build(deps): bump github.com/miekg/dns from 1.1.50 to 1.1.51 (coredns…

763b797

…#5936)

build(deps): bump github/codeql-action from 2.2.4 to 2.2.5 (coredns#5937

39b8f78

)

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

2cf4b3d

…coredns#5939)

build(deps): bump golang.org/x/crypto (coredns#5941)

03bb228

build(deps): bump github.com/antonmedv/expr from 1.12.0 to 1.12.1 (co…

03fb2fa

…redns#5940)

DoH: Allow http as the protocol (coredns#5762)

80b40c1

This change avoids the hard coding of HTTPS, allowing flexibility in whether HTTP or HTTPS is used. Signed-off-by: Sebastian Dahlgren <[email protected]>

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2023

dependabot bot and others added 2 commits August 14, 2023 09:19

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 14, 2023

chrisohaver and others added 10 commits August 14, 2023 20:33

Revert "plugin/forward: Continue waiting after receiving malformed re…

678d033

…sponses (coredns#6014)" (coredns#6270) This reverts commit 604a902.

1.11.1 release: bump version + add notes (coredns#6273)

ae2bbc2

* bump version; add notes Signed-off-by: Chris O'Haver <[email protected]> --------- Signed-off-by: Chris O'Haver <[email protected]>

merge coredns/coredns v1.11.1

a631050

UPSTREAM: <carry>: openshift: Make coredns exclusion more specific

4c6110d

The coredns exclusion in .gitignore was ignoring anything that was named coredns. This patch makes it specifically just the binary in the main dir.

UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary

a5843d8

UPSTREAM: <carry>: openshift: Vendor required modules

6a6aca3

Should be reevaluated next rebase. Co-authored-by: Ryan Fredette <[email protected]> Modified-by: Grant Spence <[email protected]>

UPSTREAM: <carry>: openshift: Disable dependabot

5378301

Disable dependabot in the openshift fork

gcs278 force-pushed the merge-1.11.0 branch from 5e4ed46 to 5378301 Compare August 16, 2023 03:10

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 16, 2023

gcs278 changed the title ~~OCPBUGS-13968: Merge 1.11.0~~ OCPBUGS-13968: Merge 1.11.1 Aug 16, 2023

gcs278 mentioned this pull request Aug 16, 2023

OCPBUGS-13968: Merge 1.11.1 #94

Merged

openshift-ci bot closed this Aug 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-13968: Merge 1.11.1 #93

OCPBUGS-13968: Merge 1.11.1 #93

gcs278 commented Aug 8, 2023 •

edited

Loading

rfredette commented Aug 14, 2023

Miciah commented Aug 14, 2023

openshift-ci bot commented Aug 16, 2023

gcs278 commented Aug 16, 2023

openshift-ci-robot commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023

openshift-ci-robot commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023

gcs278 commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023

openshift-ci-robot commented Aug 16, 2023

OCPBUGS-13968: Merge 1.11.1 #93

OCPBUGS-13968: Merge 1.11.1 #93

Conversation

gcs278 commented Aug 8, 2023 • edited Loading

rfredette commented Aug 14, 2023

Miciah commented Aug 14, 2023

openshift-ci bot commented Aug 16, 2023

gcs278 commented Aug 16, 2023

openshift-ci-robot commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023

openshift-ci-robot commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023

gcs278 commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023

openshift-ci-robot commented Aug 16, 2023

gcs278 commented Aug 8, 2023 •

edited

Loading