NE-1721: Merge 1.11.3 by gcs278 · Pull Request #118 · openshift/coredns

gcs278 · 2024-05-09T18:12:51Z

Rebased to CoreDNS 1.11.3 (note that 1.11.2 was skipped because it was not an official release).

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

git remote update
git checkout v1.11.3
git checkout -b merge-1.11.3-tmp
git checkout origin/master
echo 'merge coredns/coredns v1.11.3' | git commit-tree 'merge-1.11.3-tmp^{tree}' -p HEAD -p merge-1.11.3-tmp -F -
22d5f9e222defed49ffe0632ec224cf1b4f6c8a8
git branch merge-1.11.3 22d5f9e222defed49ffe0632ec224cf1b4f6c8a8
git checkout merge-1.11.3
git rev-list --reverse --no-merges a63105089cf042df50b79c6ff4145aee7af2f83b..origin/master | git cherry-pick --stdin
Note: a631050 is the merge commit from the last merge OCPBUGS-13968: Merge 1.11.1 #94
My merge commit from the above process was commit 23fa201

Before the rebase, we had the following commits:

$ git --no-pager log --oneline --no-merges --no-decorate a63105089cf042df50b79c6ff4145aee7af2f83b..origin/master
8eab9cb1d UPSTREAM: <carry>: openshift: Bump the version of ocp_dnsnameresolver external plugin
c87f74bc4 UPSTREAM: 6692: openshift: Fix OCPBUGS-34619
2637e6580 Updating coredns-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/coredns.yml
c442a0b59 Updating coredns-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/0a1310d4df1f00e3e218da6e356585997c7c0178/images/coredns.yml
583929976 UPSTREAM: <carry>: Address CVE-2023-49295 and CVE-2024-22189
6b897ee50 UPSTREAM: <carry>: openshift: Move ocp_dnsnameresolver before cache in plugin chaining order
7a9d9ea62 UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin
ad20b18fa Updating coredns-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/16fcb965e08aba14bb4ea6caaeeaa99fe31141bd/images/coredns.yml
37a9afe69 UPSTREAM: 6277: openshift: Fix OCPBUGS-27397
2eea6bfc6 Updating coredns-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/af2133c5194e28075efb48f4b508a98759b079d2/images/coredns.yml
59f7d2f51 UPSTREAM: 6354: openshift: Fix OCPBUGS-15755
c0451cddd UPSTREAM: <carry>: openshift: Address CVE-2023-39325
89d7d8c9a Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/da6a5af1fa96762cc8410f09fc28c0457280f59a/images/coredns.yml
5378301ac UPSTREAM: <carry>: openshift: Disable dependabot
6a6aca3cc UPSTREAM: <carry>: openshift: Vendor required modules
a5843d819 UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
4c6110d88 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
78b2bdbb2 UPSTREAM: <carry>: openshift: Add a `make test` target
f5d39cfca UPSTREAM: <carry>: openshift: Add product build config
c6cbe9feb UPSTREAM: <carry>: openshift: Add OWNERS

Rebase Interactions:

error: could not apply 5378301... UPSTREAM: : openshift: Disable dependabot

CONFLICT (modify/delete): .github/dependabot.yml deleted in 5378301ac (UPSTREAM: <carry>: openshift: Disable dependabot) and modified in HEAD.  Version HEAD of .github/dependabot.yml left in tree.

Upstream modified .github/dependabot.yml while this commit deletes it.
Resolved by deleting .github/dependabot.yml again

error: could not apply c0451cd... UPSTREAM: : openshift: Address CVE-2023-39325
```
CONFLICT (content): Merge conflict in go.mod
CONFLICT (content): Merge conflict in go.sum
```
- I skipped this cherry-pick with git cherry-pick --skip since 1.11.3 now vendors x/net v0.23.0 and this commit is no longer needed, effectively dropping this carry patch.
Empty commit due to UPSTREAM: 6354: openshift: Fix OCPBUGS-15755 now in v1.11.3 upstream:
```
nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

  git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
```
- Did a git cherry-pick --skip to just skip this. Note that the cherry-pick output was very terse (it didn't tell me what commit was empty...that was confusing).
Empty commit due to UPSTREAM: 6277: openshift: Fix OCPBUGS-27397 now in v1.11.3 upstream:
```
nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
```
- Did a git cherry-pick --skip to just skip this. Note that the cherry-pick output was very terse (it didn't tell me what commit was empty...that was confusing).
error: could not apply 7a9d9ea... UPSTREAM: : openshift: Add ocp_dnsnameresolver external plugin
```
CONFLICT (content): Merge conflict in go.mod
CONFLICT (content): Merge conflict in go.sum
```
- Accepted github.com/openshift/coredns-ocp-dnsnameresolver v0.0.0-20240326070009-fc0f61729b14 from 7a9d9ea and ensured other dependencies were met.
- Ran go mod tidy and go mod vendor with merged go.mod

error: could not apply 5839299... UPSTREAM: : Address CVE-2023-49295 and CVE-2024-22189

CONFLICT (content): Merge conflict in go.mod
CONFLICT (content): Merge conflict in go.sum
CONFLICT (rename/delete): vendor/github.com/golang/mock/mockgen/version.1.11.go renamed to vendor/go.opentelemetry.io/otel/version.go in HEAD, but deleted in 583929976 (UPSTREAM: <carry>: Address CVE-2023-49295 and CVE-2024-22189).
 CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/version.go deleted in 583929976 (UPSTREAM: <carry>: Address CVE-2023-49295 and CVE-2024-22189) and modified in HEAD.  Version HEAD of vendor/go.opentelemetry.io/otel/version.go left in tree.
CONFLICT (content): Merge conflict in vendor/golang.org/x/mod/modfile/rule.go
CONFLICT (content): Merge conflict in vendor/modules.txt

I skipped this cherry-pick with git cherry-pick --skip since 1.11.3 now vendors quic-go v0.42.0 and this commit is no longer needed, effectively dropping this carry patch.

error: could not apply 8eab9cb... UPSTREAM: : openshift: Bump the version of ocp_dnsnameresolver external plugin
```
CONFLICT (content): Merge conflict in go.mod
```
- Accepted github.com/openshift/coredns-ocp-dnsnameresolver v0.0.0-20240712094134-af651cec05d1 from 8eab9cb
- Ran go mod tidy and go mod vendor with merged go.mod

Actions I took after doing Rebase:

I squashed the following commit into the existing UPSTREAM: <carry>: openshift: Add product build config commit:

ad20b18fa Updating coredns-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/16fcb965e08aba14bb4ea6caaeeaa99fe31141bd/images/coredns.yml
2eea6bfc6 Updating coredns-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/af2133c5194e28075efb48f4b508a98759b079d2/images/coredns.yml
89d7d8c9a Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/da6a5af1fa96762cc8410f09fc28c0457280f59a/images/coredns.yml
1c65c490f Updating coredns-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/0a1310d4df1f00e3e218da6e356585997c7c0178/images/coredns.yml
8a5c3fbf5 Updating coredns-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/coredns.yml

I squashed UPSTREAM: <carry>: Move ocp_dnsnameresolver before cache in plugin chaining order and UPSTREAM: <carry>: openshift: Bump the version of ocp_dnsnameresolver external plugin into UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin to simplify future rebases:
```
50a1e581c UPSTREAM: <carry>: openshift: Move ocp_dnsnameresolver before cache in plugin chaining order
c9bba25a4 UPSTREAM: <carry>: openshift: Bump the version of ocp_dnsnameresolver external plugin
```

I vendored changed in the UPSTREAM: <carry>: openshift: Vendor required modules commit to ensure this commit contains the updated vendor packages from upstream:

go mod tidy
go mod vendor

Caused another merge conflict with UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin, but that was resolved by running go mod tidy and go mod vendor again in that commit.

$ git rebase --continue 
Auto-merging vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/podsecuritypolicy.go
CONFLICT (rename/rename): vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/podsecuritypolicy.go renamed to vendor/k8s.io/clientgo/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicybinding.go in 
HEAD and to vendor/github.com/openshift/client-go/network/applyconfigurations/network/v1alpha1/dnsnameresolver.go in 006eed0a8 (UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin).
Auto-merging vendor/modules.txt
error: could not apply 006eed0a8... UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin
$ go mod tidy
$ go mod vendor
$ git add -A
$ go rebase --continue

I rearranged the order of UPSTREAM: 6692: openshift: Fix OCPBUGS-34619 and UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin to ensure ocp_dnsnameresolver comes last because OCPBUGS-34619 fixes the go generate coredns.go generation for ocp_dnsnameresolver.
- If OCPBUGS-34619 didn't come first, then the commit for ocp_dnsnameresolver will cause incorrect generation of the core/plugin/zplugin.go. The zplugin.go file was regenerated in 8eab9cb
- See d5789eb#r1635284124

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

…oredns#6285) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v3.6.0...v3.7.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action 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 [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.27.4 to 0.28.0. - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.27.4...v0.28.0) --- updated-dependencies: - dependency-name: k8s.io/client-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>

…coredns#6279) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.322 to 1.44.327. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.322...v1.44.327) --- 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>

…oredns#6282) Bumps [github.com/quic-go/quic-go](https://github.com/quic-go/quic-go) from 0.37.4 to 0.38.0. - [Release notes](https://github.com/quic-go/quic-go/releases) - [Changelog](https://github.com/quic-go/quic-go/blob/master/Changelog.md) - [Commits](quic-go/quic-go@v0.37.4...v0.38.0) --- updated-dependencies: - dependency-name: github.com/quic-go/quic-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/forward add ignore_server_failure for masking upstream server faults Signed-off-by: schou <pschou@users.noreply.github.com> * Switch from a ignore_server_fail to a rewrite rcode type. Signed-off-by: schou <pschou@users.noreply.github.com> * trim down the tests Signed-off-by: schou <pschou@users.noreply.github.com> * fixing readme TTL and using map for rcode Signed-off-by: schou <pschou@users.noreply.github.com> * add newline Signed-off-by: schou <pschou@users.noreply.github.com> --------- Signed-off-by: schou <pschou@users.noreply.github.com>

Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 0.28.0 to 0.28.1. - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.28.0...v0.28.1) --- 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>

…dns#6293) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.136.0 to 0.138.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.136.0...v0.138.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> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…coredns#6291) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.327 to 1.44.332. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.327...v1.44.332) --- 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>

…redns#6301) Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.11.2 to 0.12.0. - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@41f05d9...fbd1636) --- updated-dependencies: - dependency-name: aquasecurity/trivy-action 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#6297) Bumps [github.com/quic-go/quic-go](https://github.com/quic-go/quic-go) from 0.38.0 to 0.38.1. - [Release notes](https://github.com/quic-go/quic-go/releases) - [Changelog](https://github.com/quic-go/quic-go/blob/master/Changelog.md) - [Commits](quic-go/quic-go@v0.38.0...v0.38.1) --- updated-dependencies: - dependency-name: github.com/quic-go/quic-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>

…oredns#6298) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.332 to 1.45.2. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.44.332...v1.45.2) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-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>

Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.11.0 to 0.12.0. - [Commits](golang/sys@v0.11.0...v0.12.0) --- updated-dependencies: - dependency-name: golang.org/x/sys 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>

…s#6277) Signed-off-by: SriHarshaBS001 <SriHarshaBS009@gmail.com>

Signed-off-by: Benjamin <72671586+benjx1990@users.noreply.github.com>

…6309) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.12.0 to 0.13.0. - [Commits](golang/crypto@v0.12.0...v0.13.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto 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>

coredns#6312) Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.0.8 to 3.1.0. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](actions/dependency-review-action@f6fff72...6c5ccda) --- updated-dependencies: - dependency-name: actions/dependency-review-action 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>

…s#6311) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@0b7f8ab...a8a3f3a) --- updated-dependencies: - dependency-name: actions/upload-artifact 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>

…redns#6308) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.45.2 to 1.45.6. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.45.2...v1.45.6) --- 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>

…dns#6307) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.138.0 to 0.139.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.138.0...v0.139.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> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ns#6306) Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.57.0 to 1.58.0. - [Release notes](https://github.com/grpc/grpc-go/releases) - [Commits](grpc/grpc-go@v1.57.0...v1.58.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>

….1 (coredns#6310) Bumps gopkg.in/DataDog/dd-trace-go.v1 from 1.54.0 to 1.54.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> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ns#6326)

…#6325)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.15.0 to 0.17.0. - [Commits](golang/net@v0.15.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

….0 (coredns#6340) Bumps gopkg.in/DataDog/dd-trace-go.v1 from 1.54.1 to 1.55.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>

…oredns#6358) Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.45.6 to 1.45.25. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Commits](aws/aws-sdk-go@v1.45.6...v1.45.25) --- 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>

…oredns#6362) Bumps [github.com/quic-go/quic-go](https://github.com/quic-go/quic-go) from 0.38.1 to 0.39.1. - [Release notes](https://github.com/quic-go/quic-go/releases) - [Changelog](https://github.com/quic-go/quic-go/blob/master/Changelog.md) - [Commits](quic-go/quic-go@v0.38.1...v0.39.1) --- updated-dependencies: - dependency-name: github.com/quic-go/quic-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>

openshift-ci · 2024-07-22T13:14:13Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rfredette

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~~ [rfredette]

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 · 2024-07-22T15:02:24Z

/retest-required

Remaining retests: 0 against base HEAD d95440d and 2 for PR HEAD ccc7fc0d513eb04efc55e5a0c6a5a2ebd955925b in total

alebedev87 · 2024-07-22T16:06:57Z

@gcs278: sorry about the rebase after #122, I should let this one go first.

Add an OWNERS file so that we can maintain this fork. Co-authored-by: Andrey Lebedev <alebedev@redhat.com> Co-authored-by: Benjamin Bennett <bbennett@redhat.com> Co-authored-by: Miciah Dashiel Butler Masters <mmasters@redhat.com> Co-authored-by: Stephen Greene <sgreene@redhat.com> Co-authored-by: Grant Spence <gspence@redhat.com>

Add Dockerfiles and .ci-operator.yaml. Co-authored-by: Antoni Segura Puimedon <antoni@redhat.com> Co-authored-by: Dan Mace <ironcladlou@gmail.com> Co-authored-by: AOS Automation Release Team <noreply@redhat.com> Co-authored-by: Justin Pierce <jupierce@redhat.com> Co-authored-by: openshift-bot <openshift-bot@users.noreply.github.com> Co-authored-by: openshift-ci-robot <openshift-ci-robot@users.noreply.github.com> Modified-by: Grant Spence <gspence@redhat.com>

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 <rfredette@redhat.com> Modified-by: Grant Spence <gspence@redhat.com>

Disable dependabot in the openshift fork

Generate zplugin.go correctly with third-party plugins (coredns#6692) Previously, the generation of zplugin.go would not separate third-party external plugins from CoreDNS plugins in the go import block. This leads to the TestImportOrdering unit test failing, as it requires that third-party imports paths to be in a separate import block. While this issue does not affect the main CoreDNS repo, it can cause unit test failures in forks of CoreDNS that include external third-party plugins. Signed-off-by: Grant Spence <gspence@redhat.com>

openshift-ci-robot · 2024-07-22T17:41:23Z

@gcs278: This pull request references NE-1721 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set.

Details

In response to this:

Rebased to CoreDNS 1.11.3 (note that 1.11.2 was skipped because it was not an official release).

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

git remote update

git checkout v1.11.3

git checkout -b merge-1.11.3-tmp

git checkout origin/master

echo 'merge coredns/coredns v1.11.3' | git commit-tree 'merge-1.11.3-tmp^{tree}' -p HEAD -p merge-1.11.3-tmp -F -
22d5f9e222defed49ffe0632ec224cf1b4f6c8a8

git branch merge-1.11.3 22d5f9e222defed49ffe0632ec224cf1b4f6c8a8

git checkout merge-1.11.3

git rev-list --reverse --no-merges a63105089cf042df50b79c6ff4145aee7af2f83b..origin/master | git cherry-pick --stdin
Note: a631050 is the merge commit from the last merge OCPBUGS-13968: Merge 1.11.1 #94

My merge commit from the above process was commit 23fa201

Before the rebase, we had the following commits:
$ git --no-pager log --oneline --no-merges --no-decorate a63105089cf042df50b79c6ff4145aee7af2f83b..origin/master
8eab9cb1d UPSTREAM: <carry>: openshift: Bump the version of ocp_dnsnameresolver external plugin
c87f74bc4 UPSTREAM: 6692: openshift: Fix OCPBUGS-34619
2637e6580 Updating coredns-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/coredns.yml
c442a0b59 Updating coredns-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/0a1310d4df1f00e3e218da6e356585997c7c0178/images/coredns.yml
583929976 UPSTREAM: <carry>: Address CVE-2023-49295 and CVE-2024-22189
6b897ee50 UPSTREAM: <carry>: openshift: Move ocp_dnsnameresolver before cache in plugin chaining order
7a9d9ea62 UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin
ad20b18fa Updating coredns-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/16fcb965e08aba14bb4ea6caaeeaa99fe31141bd/images/coredns.yml
37a9afe69 UPSTREAM: 6277: openshift: Fix OCPBUGS-27397
2eea6bfc6 Updating coredns-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/af2133c5194e28075efb48f4b508a98759b079d2/images/coredns.yml
59f7d2f51 UPSTREAM: 6354: openshift: Fix OCPBUGS-15755
c0451cddd UPSTREAM: <carry>: openshift: Address CVE-2023-39325
89d7d8c9a Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/da6a5af1fa96762cc8410f09fc28c0457280f59a/images/coredns.yml
5378301ac UPSTREAM: <carry>: openshift: Disable dependabot
6a6aca3cc UPSTREAM: <carry>: openshift: Vendor required modules
a5843d819 UPSTREAM: <carry>: openshift: .gitignore: Properly ignore coredns binary
4c6110d88 UPSTREAM: <carry>: openshift: Make coredns exclusion more specific
78b2bdbb2 UPSTREAM: <carry>: openshift: Add a `make test` target
f5d39cfca UPSTREAM: <carry>: openshift: Add product build config
c6cbe9feb UPSTREAM: <carry>: openshift: Add OWNERS
Rebase Interactions:

error: could not apply 5378301... UPSTREAM: : openshift: Disable dependabot
CONFLICT (modify/delete): .github/dependabot.yml deleted in 5378301ac (UPSTREAM: <carry>: openshift: Disable dependabot) and modified in HEAD.  Version HEAD of .github/dependabot.yml left in tree.
Upstream modified .github/dependabot.yml while this commit deletes it.

Resolved by deleting .github/dependabot.yml again

error: could not apply c0451cd... UPSTREAM: : openshift: Address CVE-2023-39325
CONFLICT (content): Merge conflict in go.mod
CONFLICT (content): Merge conflict in go.sum
I skipped this cherry-pick with git cherry-pick --skip since 1.11.3 now vendors x/net v0.23.0 and this commit is no longer needed, effectively dropping this carry patch.

Empty commit due to UPSTREAM: 6354: openshift: Fix OCPBUGS-15755 now in v1.11.3 upstream:
nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

  git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
Did a git cherry-pick --skip to just skip this. Note that the cherry-pick output was very terse (it didn't tell me what commit was empty...that was confusing).
Empty commit due to UPSTREAM: 6277: openshift: Fix OCPBUGS-27397 now in v1.11.3 upstream:
nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
Did a git cherry-pick --skip to just skip this. Note that the cherry-pick output was very terse (it didn't tell me what commit was empty...that was confusing).

error: could not apply 7a9d9ea... UPSTREAM: : openshift: Add ocp_dnsnameresolver external plugin
CONFLICT (content): Merge conflict in go.mod
CONFLICT (content): Merge conflict in go.sum
Accepted github.com/openshift/coredns-ocp-dnsnameresolver v0.0.0-20240326070009-fc0f61729b14 from 7a9d9ea and ensured other dependencies were met.

Ran go mod tidy and go mod vendor with merged go.mod

error: could not apply 5839299... UPSTREAM: : Address CVE-2023-49295 and CVE-2024-22189
CONFLICT (content): Merge conflict in go.mod
CONFLICT (content): Merge conflict in go.sum
CONFLICT (rename/delete): vendor/github.com/golang/mock/mockgen/version.1.11.go renamed to vendor/go.opentelemetry.io/otel/version.go in HEAD, but deleted in 583929976 (UPSTREAM: <carry>: Address CVE-2023-49295 and CVE-2024-22189).
 CONFLICT (modify/delete): vendor/go.opentelemetry.io/otel/version.go deleted in 583929976 (UPSTREAM: <carry>: Address CVE-2023-49295 and CVE-2024-22189) and modified in HEAD.  Version HEAD of vendor/go.opentelemetry.io/otel/version.go left in tree.
CONFLICT (content): Merge conflict in vendor/golang.org/x/mod/modfile/rule.go
CONFLICT (content): Merge conflict in vendor/modules.txt
I skipped this cherry-pick with git cherry-pick --skip since 1.11.3 now vendors quic-go v0.42.0 and this commit is no longer needed, effectively dropping this carry patch.

error: could not apply 8eab9cb... UPSTREAM: : openshift: Bump the version of ocp_dnsnameresolver external plugin
CONFLICT (content): Merge conflict in go.mod
Accepted github.com/openshift/coredns-ocp-dnsnameresolver v0.0.0-20240712094134-af651cec05d1 from 8eab9cb

Ran go mod tidy and go mod vendor with merged go.mod

Actions I took after doing Rebase:

I squashed the following commit into the existing UPSTREAM: <carry>: openshift: Add product build config commit:
ad20b18fa Updating coredns-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/16fcb965e08aba14bb4ea6caaeeaa99fe31141bd/images/coredns.yml
2eea6bfc6 Updating coredns-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/af2133c5194e28075efb48f4b508a98759b079d2/images/coredns.yml
89d7d8c9a Updating coredns images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/da6a5af1fa96762cc8410f09fc28c0457280f59a/images/coredns.yml
1c65c490f Updating coredns-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/0a1310d4df1f00e3e218da6e356585997c7c0178/images/coredns.yml
8a5c3fbf5 Updating coredns-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/coredns.yml
I squashed UPSTREAM: <carry>: Move ocp_dnsnameresolver before cache in plugin chaining order and UPSTREAM: <carry>: openshift: Bump the version of ocp_dnsnameresolver external plugin into UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin to simplify future rebases:
50a1e581c UPSTREAM: <carry>: openshift: Move ocp_dnsnameresolver before cache in plugin chaining order
c9bba25a4 UPSTREAM: <carry>: openshift: Bump the version of ocp_dnsnameresolver external plugin
I vendored changed in the UPSTREAM: <carry>: openshift: Vendor required modules commit to ensure this commit contains the updated vendor packages from upstream:
go mod tidy
go mod vendor
Caused another merge conflict with UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin, but that was resolved by running go mod tidy and go mod vendor again in that commit.
$ git rebase --continue 
Auto-merging vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/podsecuritypolicy.go
CONFLICT (rename/rename): vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/podsecuritypolicy.go renamed to vendor/k8s.io/clientgo/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicybinding.go in 
HEAD and to vendor/github.com/openshift/client-go/network/applyconfigurations/network/v1alpha1/dnsnameresolver.go in 006eed0a8 (UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin).
Auto-merging vendor/modules.txt
error: could not apply 006eed0a8... UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin
$ go mod tidy
$ go mod vendor
$ git add -A
$ go rebase --continue
I rearranged the order of UPSTREAM: 6692: openshift: Fix OCPBUGS-34619 and UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin to ensure ocp_dnsnameresolver comes last because OCPBUGS-34619 fixes the go generate coredns.go generation for ocp_dnsnameresolver.

If OCPBUGS-34619 didn't come first, then the commit for ocp_dnsnameresolver will cause incorrect generation of the core/plugin/zplugin.go. The zplugin.go file was regenerated in 8eab9cb

See d5789eb#r1635284124

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 openshift-eng/jira-lifecycle-plugin repository.

gcs278 · 2024-07-22T17:45:40Z

@rfredette Thanks for the review. Just rebased for picking up #122.

@arkadeepsen, also mind taking a look to make sure everything looks correct? I see you generated zplugin.go in #122, that's good. I put all of your ocp_dnsnameresolver in 1 commit as usual, and moved it to the end to make sure it keeps correct zplugin.go generation fix, just to be safe.

CC: @alebedev87

gcs278 · 2024-07-22T21:38:57Z

infra error:
/test e2e-aws-ovn-upgrade

openshift-ci · 2024-07-22T23:42:08Z

@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-sigs/prow repository. I understand the commands that are listed here.

arkadeepsen · 2024-07-23T05:59:59Z

@arkadeepsen, also mind taking a look to make sure everything looks correct? I see you generated zplugin.go in #122, that's good. I put all of your ocp_dnsnameresolver in 1 commit as usual, and moved it to the end to make sure it keeps correct zplugin.go generation fix, just to be safe.

@gcs278 The commit looks good to me 👍

alebedev87 · 2024-07-23T07:41:52Z

/lgtm

openshift-bot · 2024-07-23T14:04:14Z

[ART PR BUILD NOTIFIER]

Distgit: coredns
This PR has been included in build coredns-container-v4.17.0-202407231314.p0.gd3b441c.assembly.stream.el9.
All builds following this will include this PR.

NE-1721: Merge 1.11.3

dependabot Bot and others added 30 commits August 21, 2023 09:32

build(deps): bump actions/checkout from 3 to 4 (coredns#6302)

96d3e09

Handle UDP responses that overflow with TC bit with test case (coredn…

4c69549

…s#6277) Signed-off-by: SriHarshaBS001 <SriHarshaBS009@gmail.com>

Add PITS Global Data Recovery Services as an adopter (coredns#6304)

07acaae

Signed-off-by: Benjamin <72671586+benjx1990@users.noreply.github.com>

build(deps): bump google.golang.org/grpc from 1.58.0 to 1.58.1 (cored…

cb12144

…ns#6326)

build(deps): bump k8s.io/client-go from 0.28.1 to 0.28.2 (coredns#6324)

ccf0ad3

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

45923b6

…#6325)

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 22, 2024

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2024

gcs278 and others added 10 commits July 22, 2024 13:16

merge coredns/coredns v1.11.3

22d5f9e

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

cae06b4

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

0df6a4c

UPSTREAM: <carry>: openshift: Vendor required modules

7d3b0d2

Should be reevaluated next rebase. Co-authored-by: Ryan Fredette <rfredette@redhat.com> Modified-by: Grant Spence <gspence@redhat.com>

UPSTREAM: <carry>: openshift: Disable dependabot

213249c

Disable dependabot in the openshift fork

UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin

7a4db4b

gcs278 force-pushed the merge-1.11.3 branch from ccc7fc0 to 7a4db4b Compare July 22, 2024 17:41

openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2024

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2024

openshift-ci Bot assigned alebedev87 Jul 23, 2024

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2024

openshift-merge-bot Bot merged commit d3b441c into openshift:master Jul 23, 2024

alebedev87 mentioned this pull request Nov 6, 2025

NE-2194: Rebase to v1.13.1 report & rebase work #157

Merged

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

Merge pull request openshift#118 from gcs278/merge-1.11.3

6b7389a

NE-1721: Merge 1.11.3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NE-1721: Merge 1.11.3#118

NE-1721: Merge 1.11.3#118
openshift-merge-bot[bot] merged 173 commits intoopenshift:masterfrom
gcs278:merge-1.11.3

gcs278 commented May 9, 2024 •

edited

Loading

Uh oh!

openshift-ci Bot commented Jul 22, 2024

Uh oh!

openshift-ci-robot commented Jul 22, 2024

Uh oh!

alebedev87 commented Jul 22, 2024

Uh oh!

openshift-ci-robot commented Jul 22, 2024 •

edited by openshift-ci Bot

Loading

Uh oh!

gcs278 commented Jul 22, 2024

Uh oh!

gcs278 commented Jul 22, 2024

Uh oh!

openshift-ci Bot commented Jul 22, 2024

Uh oh!

arkadeepsen commented Jul 23, 2024

Uh oh!

alebedev87 commented Jul 23, 2024

Uh oh!

openshift-bot commented Jul 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Conversation

gcs278 commented May 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Jul 22, 2024

Uh oh!

openshift-ci-robot commented Jul 22, 2024

Uh oh!

alebedev87 commented Jul 22, 2024

Uh oh!

openshift-ci-robot commented Jul 22, 2024 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gcs278 commented Jul 22, 2024

Uh oh!

gcs278 commented Jul 22, 2024

Uh oh!

openshift-ci Bot commented Jul 22, 2024

Uh oh!

arkadeepsen commented Jul 23, 2024

Uh oh!

alebedev87 commented Jul 23, 2024

Uh oh!

openshift-bot commented Jul 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

gcs278 commented May 9, 2024 •

edited

Loading

openshift-ci-robot commented Jul 22, 2024 •

edited by openshift-ci Bot

Loading