NE-1721: Merge 1.11.3 #118

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 -
23fa2013868d06dd39fa479bb5a7ad1d08ddbb12
git branch merge-1.11.3 23fa2013868d06dd39fa479bb5a7ad1d08ddbb12
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
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.

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 6b897ee UPSTREAM: <carry>: Move ocp_dnsnameresolver before cache in plugin chaining order into 7a9d9ea UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin to simplify future rebases:
```
6b897ee50 UPSTREAM: <carry>: openshift: Move ocp_dnsnameresolver before cache in plugin chaining order
7a9d9ea62 UPSTREAM: <carry>: openshift: Add 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 so that I could run go generate coredns.go on the ocp_dnsnameresolver commit to regenerate the zplugin.go file so that it doesn't get regenerated in CI. This is not critical, but a more of a "completeness" fix to ensure the local zplugin.go matches the expected generated version. See d5789eb#r1635284124
```
$ git rebase -i d5789ebac4a2a489d025b10cb261b66c1e04d9f2~
# swap the order of "UPSTREAM: 6692: openshift: Fix OCPBUGS-34619" and "UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin"
# edit "UPSTREAM: <carry>: openshift: Add ocp_dnsnameresolver external plugin"
$ go generate coredns.go
$ git add core/plugin/zplugin.go
$ git commit --amend ...
$ git rebase --continue
```

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-robot · 2024-06-10T19:19:33Z

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

In response to this:

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.

openshift-ci-robot · 2024-06-10T19:26:38Z

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

In response to this:

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.

openshift-ci-robot · 2024-06-10T19:32:10Z

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

In response to this:

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.

openshift-ci-robot · 2024-06-10T19:32:41Z

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

In response to this:

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.

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

openshift-ci-robot · 2024-06-10T19:39:03Z

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

In response to this:

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.

openshift-ci-robot · 2024-06-10T19:39:16Z

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

In response to this:

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.

openshift-ci-robot · 2024-06-10T19:40:44Z

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

In response to this:

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.

openshift-ci-robot · 2024-06-10T19:42:03Z

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

In response to this:

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.

openshift-ci-robot · 2024-06-10T19:48:32Z

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

In response to this:

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-06-10T19:49:19Z

Unit test issues should be resolved now.
/unhold

arkadeepsen · 2024-06-11T05:46:54Z

core/plugin/zplugin.go

@@ -56,4 +56,7 @@ import (
 	_ "github.com/coredns/coredns/plugin/tsig"
 	_ "github.com/coredns/coredns/plugin/view"
 	_ "github.com/coredns/coredns/plugin/whoami"
+
+


@gcs278 can you please run go generate coredns.go for generating this file? I had added one extra line as a hack for passing the import ordering unit test. As you have fixed the generation of this file we should use the correctly generated file then.

Hmm. This is an interesting problem. Yes we could re-generate the file, but I'd have to do that in the cherry-pick commit: 2b42769 because that's where the fix is in and it comes after this commit for ocp nameresolver.

But that seems problematic when we drop this carry patch when the "fix" is in the next CoreDNS rebase. Then the go generate will disappear...

I think our options are:

Re-arrange 2b42769 (go generate coredns.go "fix") and d5789eb (ocp nameresolver) so that the go generate "fix" comes first, and then go a go generate coredns.go on the ocp nameresolver test in thiis PR.

We don't do anything, CI still passes since go generate coredns.go runs before unit tests. This also feels a bit kludgy, since the generated file in the local repo is left incorrectly to be regenerated in CI.

We add merge another PR in master that only does a go generate coredns.go and re-do this rebase to pull that commit in, and squash it into d5789eb (ocp nameresolver).

I'm also considering the backport for 4.16 of the "fix": #123.

I think # 3 is the most "correct" approach because it provides a discrete commit we can backport to 4.16, but it feels like overkill to do all of that. But I think doing # 1, and moving forward with the master branch having the correctly generated zplugin.go file, is acceptable. For the 4.16 backport, #123, we can just leave the 4.16 zplugin.go alone. CI will still get fixed in 4.16 as long as #123 gets merged.

Done. Re-Arranged and ran go generate coredns.go. PTAL.

I agree with you that # 1 is probably the fix we can go with.
I have another PR (#122) which I need to backport to 4.16. I can probably do a manual backport and re-generate the zplugin.go in the backport PR. WDYT?

Yea I think that's fine. I would probably still separate it as a separate commit to be organized. And you'll need to wait for #123 to be backported.

I forgot to mention that the risk with NOT committing the generated "fixed" zplugin file is: the core/plugin/zplugin.go will get regenerated locally when you run make. So that may confuse people doing 4.16 backports, but it's not actually problematic, just annoying.

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>

Modified-by: Grant Spence <gspence@redhat.com>

openshift-ci-robot · 2024-06-11T18:14:33Z

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

In response to this:

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.

openshift-ci-robot · 2024-06-11T18:15:12Z

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

In response to this:

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.

openshift-ci-robot · 2024-06-11T18:19:47Z

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

In response to this:

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.

openshift-ci · 2024-06-11T20:35:29Z

@gcs278: The following tests 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-gcp-serial	`ccc7fc0`	link	true	`/test e2e-gcp-serial`
ci/prow/e2e-metal-ipi-ovn	`ccc7fc0`	link	false	`/test e2e-metal-ipi-ovn`

Full PR test history. Your PR dashboard.

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.

candita · 2024-06-12T18:24:22Z

/assign @rfredette

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-robot and others added 6 commits June 10, 2024 15:32

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

b9ca0af

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

79495ea

UPSTREAM: <carry>: openshift: Vendor required modules

34ad505

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

2878934

Disable dependabot in the openshift fork

gcs278 force-pushed the merge-1.11.3 branch from cd85f83 to 2b42769 Compare June 10, 2024 19:40

gcs278 changed the title ~~[WIP] NE-1721: Merge 1.11.3~~ NE-1721: Merge 1.11.3 Jun 10, 2024

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 10, 2024

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 10, 2024

arkadeepsen reviewed Jun 11, 2024

View reviewed changes

gcs278 and others added 2 commits June 11, 2024 14:03

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

ccc7fc0

Modified-by: Grant Spence <gspence@redhat.com>

gcs278 force-pushed the merge-1.11.3 branch from 2b42769 to ccc7fc0 Compare June 11, 2024 18:05

openshift-ci bot assigned rfredette Jun 12, 2024

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

gcs278 commented May 9, 2024 •

edited

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

gcs278 commented Jun 10, 2024

arkadeepsen Jun 11, 2024

gcs278 Jun 11, 2024

gcs278 Jun 11, 2024

arkadeepsen Jun 11, 2024

gcs278 Jun 11, 2024

openshift-ci-robot commented Jun 11, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 11, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 11, 2024 •

edited by openshift-ci bot

openshift-ci bot commented Jun 11, 2024

candita commented Jun 12, 2024

NE-1721: Merge 1.11.3 #118

Are you sure you want to change the base?

NE-1721: Merge 1.11.3 #118

Conversation

gcs278 commented May 9, 2024 • edited

openshift-ci-robot commented Jun 10, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 • edited by openshift-ci bot

gcs278 commented Jun 10, 2024

arkadeepsen Jun 11, 2024

Choose a reason for hiding this comment

gcs278 Jun 11, 2024

Choose a reason for hiding this comment

gcs278 Jun 11, 2024

Choose a reason for hiding this comment

arkadeepsen Jun 11, 2024

Choose a reason for hiding this comment

gcs278 Jun 11, 2024

Choose a reason for hiding this comment

openshift-ci-robot commented Jun 11, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 11, 2024 • edited by openshift-ci bot

openshift-ci-robot commented Jun 11, 2024 • edited by openshift-ci bot

openshift-ci bot commented Jun 11, 2024

candita commented Jun 12, 2024

gcs278 commented May 9, 2024 •

edited

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 10, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 11, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 11, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Jun 11, 2024 •

edited by openshift-ci bot