Skip to content

Bug 2090827: Merge 1.9.2#73

Merged
openshift-merge-robot merged 199 commits intoopenshift:masterfrom
Miciah:merge-1.9.2
Jun 1, 2022
Merged

Bug 2090827: Merge 1.9.2#73
openshift-merge-robot merged 199 commits intoopenshift:masterfrom
Miciah:merge-1.9.2

Conversation

@Miciah
Copy link
Copy Markdown

@Miciah Miciah commented May 26, 2022

Rebased to CoreDNS 1.9.2 so that we use the Kubernetes 1.24 packages. This also updates to Go 1.18 and brings in some important upstream CoreDNS fixes.

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

  1. git remote update
  2. git checkout v1.9.2
  3. git checkout -b merge-1.9.2-tmp
  4. git checkout origin/master
  5. echo 'merge coredns/coredns v1.9.2' | git commit-tree 'merge-1.9.2-tmp^{tree}' -p HEAD -p merge-1.9.2-tmp -F -
  6. git branch merge-1.9.2 555dd549ee36ba7f626cf8c53707c74af318ec09
  7. git checkout merge-1.9.2
  8. git rev-list --reverse --no-merges ccbc66ea50b1d0b8af75b41c332ec15bf4853887..origin/master | git cherry-pick --stdin

My merge commit from the above process was commit 555dd54.

Before the rebase, we had the following commits:

% git --no-pager log --oneline --no-merges ccbc66ea50b1d0b8af75b41c332ec15bf4853887..origin/master                                        
fd4fcc516 Added gcs278 to OWNERS
b1601880b (Miciah/merge-1.8.7, merge-1.8.7) UPSTREAM: <carry>: openshift: Update builder images
31190470a UPSTREAM: <carry>: openshift: Disable dependabot
80b7832fe UPSTREAM: <carry>: openshift: Vendor required modules
03c0039c9 UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
20cd7a701 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
491e0046c UPSTREAM: <carry>: openshift: Add a `make test` target
6ab418926 UPSTREAM: <carry>: openshift: Add a product build pipeline Dockerfile
98da35111 UPSTREAM: <carry>: openshift: Add OWNERS
a80f04ac9 UPSTREAM: <carry>: openshift: Updating .ci-operator.yaml `build_root_image` from openshift/release
% 

I squashed the following two commits into a single "Add OWNERS" commit:

fd4fcc516 Added gcs278 to OWNERS
98da35111 UPSTREAM: <carry>: openshift: Add OWNERS

I squashed the following three commits into a single "Add product build config" commit:

26cb8c20b UPSTREAM: <carry>: openshift: Updating .ci-operator.yaml `build_root_image` from openshift/release
8ca371f27 UPSTREAM: <carry>: openshift: Add a product build pipeline Dockerfile
8e159ba53 UPSTREAM: <carry>: openshift: Update builder images

I edited the "Add product build config" commit to use the "rhel-8-release-golang-1.18-openshift-4.11" builder image tag.

I edited the "Vendor required modules" commit by running go mod vendor and go mod tidy.

I added two new carries:

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

I had to resolve some conflicts in handler_test.go. We'll carry these two commits in OpenShift 4.11 to give users more time to migrate applications that use wildcard DNS lookups.

dependabot Bot and others added 30 commits January 17, 2022 07:49
…oredns#5096)

Bumps [github.com/Azure/go-autorest/autorest/azure/auth](https://github.com/Azure/go-autorest) from 0.5.10 to 0.5.11.
- [Release notes](https://github.com/Azure/go-autorest/releases)
- [Changelog](https://github.com/Azure/go-autorest/blob/master/CHANGELOG.md)
- [Commits](Azure/go-autorest@autorest/azure/auth/v0.5.10...autorest/azure/auth/v0.5.11)

---
updated-dependencies:
- dependency-name: github.com/Azure/go-autorest/autorest/azure/auth
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
….0 (coredns#5101)

Bumps [gopkg.in/DataDog/dd-trace-go.v1](https://github.com/DataDog/dd-trace-go) from 1.34.0 to 1.35.0.
- [Release notes](https://github.com/DataDog/dd-trace-go/releases)
- [Commits](DataDog/dd-trace-go@v1.34.0...v1.35.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>

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>
Signed-off-by: xuweiwei <xuweiwei_yewu@cmss.chinamobile.com>
Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.23.1 to 0.23.2.
- [Release notes](https://github.com/kubernetes/client-go/releases)
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.23.1...v0.23.2)

---
updated-dependencies:
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/Azure/azure-sdk-for-go](https://github.com/Azure/azure-sdk-for-go) from 61.1.0+incompatible to 61.3.0+incompatible.
- [Release notes](https://github.com/Azure/azure-sdk-for-go/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/CHANGELOG.md)
- [Commits](Azure/azure-sdk-for-go@v61.1.0...v61.3.0)

---
updated-dependencies:
- dependency-name: github.com/Azure/azure-sdk-for-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* plugin/prometheus: write rcode properly to the metrics

Signed-off-by: Ondřej Benkovský <ondrej.benkovsky@jamf.com>
…sponse is truncated (coredns#4713)

* persist truncated state to client if cname lookup response is truncated

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Signed-off-by: coredns[bot] <bot@bot.coredns.io>
….1 (coredns#5140)

Bumps [github.com/oschwald/geoip2-golang](https://github.com/oschwald/geoip2-golang) from 1.5.0 to 1.6.1.
- [Release notes](https://github.com/oschwald/geoip2-golang/releases)
- [Commits](oschwald/geoip2-golang@v1.5.0...v1.6.1)

---
updated-dependencies:
- dependency-name: github.com/oschwald/geoip2-golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/Azure/azure-sdk-for-go](https://github.com/Azure/azure-sdk-for-go) from 61.3.0+incompatible to 61.4.0+incompatible.
- [Release notes](https://github.com/Azure/azure-sdk-for-go/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/CHANGELOG.md)
- [Commits](Azure/azure-sdk-for-go@v61.3.0...v61.4.0)

---
updated-dependencies:
- dependency-name: github.com/Azure/azure-sdk-for-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…oredns#5139)

Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.42.39 to 1.42.44.
- [Release notes](https://github.com/aws/aws-sdk-go/releases)
- [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md)
- [Commits](aws/aws-sdk-go@v1.42.39...v1.42.44)

---
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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.23.2 to 0.23.3.
- [Release notes](https://github.com/kubernetes/client-go/releases)
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.23.2...v0.23.3)

---
updated-dependencies:
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ns#5136)

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.43.0 to 1.44.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.43.0...v1.44.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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.12.0 to 1.12.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.12.0...v1.12.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
….0 (coredns#5142)

Bumps [gopkg.in/DataDog/dd-trace-go.v1](https://github.com/DataDog/dd-trace-go) from 1.35.0 to 1.36.0.
- [Release notes](https://github.com/DataDog/dd-trace-go/releases)
- [Commits](DataDog/dd-trace-go@v1.35.0...v1.36.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>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
fix convert key to domain when key ends with '/'
Miciah added 2 commits May 27, 2022 10:46
…lity (coredns#5019)"

This reverts commit abaf938.

We will carry this commit in OpenShift 4.11 to provide any users with
applications that use wildcard DNS lookups more time to migrate their
applications.
@Miciah
Copy link
Copy Markdown
Author

Miciah commented May 27, 2022

Lots of failures in e2e-aws-upgrade, but it passed before.
/test e2e-aws-upgrade

Failing tests:

[sig-imageregistry][Serial][Suite:openshift/registry/serial] Image signature workflow can push a signed image to openshift registry and verify it [Skipped:Disconnected] [Suite:openshift/conformance/serial]

/test e2e-gcp-serial

e2e-metal-ipi is all red: https://prow.ci.openshift.org/job-history/gs/origin-ci-test/pr-logs/directory/pull-ci-openshift-coredns-master-e2e-metal-ipi

@melvinjoseph86
Copy link
Copy Markdown

Verified via pre-merge verification workflow, more references related to the test can be found in:
https://bugzilla.redhat.com/show_bug.cgi?id=2090827#c1

@melvinjoseph86
Copy link
Copy Markdown

/label qe-approved

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label May 30, 2022
@frobware
Copy link
Copy Markdown

@Miciah @rfredette my previous make test failures were due to an outdated faillint on my PATH. I removed it and make test passes. I updated faillint and make test also passes.

@frobware
Copy link
Copy Markdown

/lgtm
/hold
Adding hold in case you want to continue soak testing in CI.

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 31, 2022
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 31, 2022
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 31, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: frobware, Miciah

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@frobware
Copy link
Copy Markdown

Failed: disruption_tests [sig-network-edge] Verify DNS availability during and after upgrade success, but the log shows the error as nil.

/test e2e-aws-upgrade

@rfredette
Copy link
Copy Markdown

Looks good to me as well 👍

@frobware
Copy link
Copy Markdown

frobware commented Jun 1, 2022

CI soak test.

/test all

@Miciah
Copy link
Copy Markdown
Author

Miciah commented Jun 1, 2022

/hold cancel
/skip

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 1, 2022
@Miciah
Copy link
Copy Markdown
Author

Miciah commented Jun 1, 2022

[sig-instrumentation][Late]  Alerts shouldn't report any unexpected alerts in firing or pending  state [Suite:openshift/conformance/parallel]
{  fail [github.com/onsi/ginkgo@v4.7.0-origin.0+incompatible/internal/leafnodes/runner.go:113]: Jun  1 10:16:37.692: Unexpected alerts fired or pending after the test run:  alert KubeAggregatedAPIDown fired for 41 seconds with labels: {name="v1.packages.operators.coreos.com", namespace="default", severity="warning"}}

/test e2e-gcp-serial

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

Remaining retests: 2 against base HEAD 0d6afb1 and 8 for PR HEAD 349db7a in total

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jun 1, 2022

@Miciah: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-metal-ipi 349db7a link false /test e2e-metal-ipi

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.

@openshift-merge-robot openshift-merge-robot merged commit 7fe212f into openshift:master Jun 1, 2022
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jun 1, 2022

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

Bugzilla bug 2090827 has been moved to the MODIFIED state.

Details

In response to this:

Bug 2090827: Merge 1.9.2

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 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
jjkiely pushed a commit to Kuadrant/coredns that referenced this pull request Sep 24, 2025
bentito pushed a commit to bentito/coredns that referenced this pull request Nov 21, 2025
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. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.