OCPBUGS-61749: [release-4.17] Fix dnsnameresolver address set #2796

arkadeepsen · 2025-10-09T11:56:06Z

Manual cherry-pick of 575a08c and 4780a5e

Conflict resolved with go-controller/pkg/ovn/dns_name_resolver/external_dns_test.go by using the incoming changes:

func expectDNSNameWithAddresses(extEgDNS *ExternalEgressDNS, dnsName string, expectedAddresses []string) {
<<<<<<< HEAD
	var resolvedName *dnsResolvedName
	err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 5*time.Minute, true, func(ctx context.Context) (done bool, err error) {
		var exists bool
		resolvedName, exists = extEgDNS.getResolvedName(dnsName)
=======
	gomega.Eventually(func() []string {
		resolvedName, exists := extEgDNS.getResolvedName(dnsName)
>>>>>>> 4780a5e23 (dnsnameresolver: add unit test for DNSNameResolver resource update)
		if !exists {
			return []string{}
		}
		v4, v6 := resolvedName.dnsAddressSet.GetAddresses()
		ipStrings := append(v4, v6...)
		return ipStrings
	}).Should(gomega.ConsistOf(expectedAddresses))
}

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

openshift-ci-robot · 2025-10-09T11:56:12Z

@arkadeepsen: This pull request references Jira Issue OCPBUGS-61749, which is invalid:

expected Jira Issue OCPBUGS-61749 to depend on a bug targeting a version in 4.18.0, 4.18.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

Manual cherry-pick of 575a08c and 4780a5e

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.

arkadeepsen · 2025-10-09T11:57:01Z

/jira refresh

openshift-ci-robot · 2025-10-09T11:57:09Z

@arkadeepsen: This pull request references Jira Issue OCPBUGS-61749, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.17.z) matches configured target version for branch (4.17.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-61748 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-61748 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
bug has dependents

Requesting review from QA contact:
/cc @huiran0826

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

arkadeepsen · 2025-10-09T16:39:22Z

/retest-required

arkadeepsen · 2025-10-09T16:46:19Z

/retest-required

arkadeepsen · 2025-10-09T18:38:06Z

/retest-required

openshift-ci · 2025-10-09T22:47:27Z

@arkadeepsen: 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/security	`8f0fca0`	link	false	`/test security`

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.

arkadeepsen · 2025-10-10T11:29:56Z

/payload 4.17 ci blocking
/payload 4.17 nightly blocking

openshift-ci · 2025-10-10T11:29:59Z

@arkadeepsen: trigger 4 job(s) of type blocking for the ci release of OCP 4.17

periodic-ci-openshift-release-master-ci-4.17-upgrade-from-stable-4.16-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.17-upgrade-from-stable-4.16-e2e-azure-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.17-e2e-gcp-ovn-upgrade
periodic-ci-openshift-hypershift-release-4.17-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/72ee80f0-a5cc-11f0-9397-9fea8a4cec77-0

trigger 8 job(s) of type blocking for the nightly release of OCP 4.17

periodic-ci-openshift-release-master-nightly-4.17-e2e-aws-ovn-serial
periodic-ci-openshift-release-master-ci-4.17-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.17-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.17-e2e-azure-ovn-upgrade
periodic-ci-openshift-release-master-ci-4.17-upgrade-from-stable-4.16-e2e-gcp-ovn-rt-upgrade
periodic-ci-openshift-hypershift-release-4.17-periodics-e2e-aws-ovn-conformance
periodic-ci-openshift-release-master-nightly-4.17-e2e-metal-ipi-ovn-bm
periodic-ci-openshift-release-master-nightly-4.17-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/72ee80f0-a5cc-11f0-9397-9fea8a4cec77-1

arkadeepsen · 2025-10-14T07:51:51Z

/payload-job periodic-ci-openshift-release-master-ci-4.17-e2e-azure-ovn-upgrade

openshift-ci · 2025-10-14T07:51:54Z

@arkadeepsen: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-ci-4.17-e2e-azure-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a5732270-a8d2-11f0-8d02-87d2610db900-0

openshift-ci-robot · 2025-10-14T13:49:53Z

@arkadeepsen: This pull request references Jira Issue OCPBUGS-61749, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.17.z) matches configured target version for branch (4.17.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-61748 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-61748 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
bug has dependents

Requesting review from QA contact:
/cc @huiran0826

In response to this:

Manual cherry-pick of 575a08c and 4780a5e

Conflict resolved with go-controller/pkg/ovn/dns_name_resolver/external_dns_test.go by using the incoming changes:

func expectDNSNameWithAddresses(extEgDNS *ExternalEgressDNS, dnsName string, expectedAddresses []string) {
<<<<<<< HEAD
  var resolvedName *dnsResolvedName
  err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 5*time.Minute, true, func(ctx context.Context) (done bool, err error) {
  	var exists bool
  	resolvedName, exists = extEgDNS.getResolvedName(dnsName)
=======
  gomega.Eventually(func() []string {
  	resolvedName, exists := extEgDNS.getResolvedName(dnsName)
>>>>>>> 4780a5e23 (dnsnameresolver: add unit test for DNSNameResolver resource update)
  	if !exists {
  		return []string{}
  	}
  	v4, v6 := resolvedName.dnsAddressSet.GetAddresses()
  	ipStrings := append(v4, v6...)
  	return ipStrings
  }).Should(gomega.ConsistOf(expectedAddresses))
}

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.

kyrtapz · 2025-10-16T10:37:48Z

/lgtm
/label backport-risk-assessed

@arkadeepsen you still need the verified label which is usually set by QE after testing the fix pre-merge

openshift-ci · 2025-10-16T10:38:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arkadeepsen, kyrtapz

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [kyrtapz]

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

huiran0826 · 2025-10-17T03:21:48Z

/verified by @huiran0826

openshift-ci-robot · 2025-10-17T03:21:59Z

@huiran0826: This PR has been marked as verified by @huiran0826.

In response to this:

/verified by @huiran0826

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 · 2025-10-17T03:24:49Z

@arkadeepsen: Jira Issue Verification Checks: Jira Issue OCPBUGS-61749
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-61749 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

Manual cherry-pick of 575a08c and 4780a5e

Conflict resolved with go-controller/pkg/ovn/dns_name_resolver/external_dns_test.go by using the incoming changes:

func expectDNSNameWithAddresses(extEgDNS *ExternalEgressDNS, dnsName string, expectedAddresses []string) {
<<<<<<< HEAD
  var resolvedName *dnsResolvedName
  err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 5*time.Minute, true, func(ctx context.Context) (done bool, err error) {
  	var exists bool
  	resolvedName, exists = extEgDNS.getResolvedName(dnsName)
=======
  gomega.Eventually(func() []string {
  	resolvedName, exists := extEgDNS.getResolvedName(dnsName)
>>>>>>> 4780a5e23 (dnsnameresolver: add unit test for DNSNameResolver resource update)
  	if !exists {
  		return []string{}
  	}
  	v4, v6 := resolvedName.dnsAddressSet.GetAddresses()
  	ipStrings := append(v4, v6...)
  	return ipStrings
  }).Should(gomega.ConsistOf(expectedAddresses))
}

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.

arkadeepsen · 2025-10-17T06:43:26Z

/cherrypick release-4.16

openshift-cherrypick-robot · 2025-10-17T06:44:08Z

@arkadeepsen: new pull request created: #2812

In response to this:

/cherrypick release-4.16

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.

openshift-merge-robot · 2025-10-18T01:20:56Z

Fix included in accepted release 4.17.0-0.nightly-2025-10-17-213314

arkadeepsen added 2 commits October 9, 2025 17:10

dnsnameresolver: fix ever growing address set

d5a781f

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

dnsnameresolver: add unit test for DNSNameResolver resource update

8f0fca0

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

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 9, 2025

openshift-ci bot requested review from martinkennelly and tssurya October 9, 2025 11:57

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 9, 2025

openshift-ci bot requested a review from huiran0826 October 9, 2025 11:57

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Oct 16, 2025

openshift-ci bot assigned anuragthehatter, asood-rh, barbora137, huiran0826, jechen0648, Meina-rh and mffiedler Oct 16, 2025

openshift-ci bot assigned qiowang721, rbbratta and weliang1 Oct 16, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 16, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 16, 2025

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 17, 2025

openshift-merge-bot bot merged commit 041b2ed into openshift:release-4.17 Oct 17, 2025
25 of 26 checks passed

openshift-cherrypick-robot mentioned this pull request Oct 17, 2025

[release-4.16] OCPBUGS-63230: Fix dnsnameresolver address set #2812

Open

OCPBUGS-61749: [release-4.17] Fix dnsnameresolver address set #2796

OCPBUGS-61749: [release-4.17] Fix dnsnameresolver address set #2796

Uh oh!

Conversation

arkadeepsen commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 9, 2025

Uh oh!

arkadeepsen commented Oct 9, 2025

Uh oh!

openshift-ci-robot commented Oct 9, 2025

Uh oh!

arkadeepsen commented Oct 9, 2025

Uh oh!

arkadeepsen commented Oct 9, 2025

Uh oh!

arkadeepsen commented Oct 9, 2025

Uh oh!

openshift-ci bot commented Oct 9, 2025

Uh oh!

arkadeepsen commented Oct 10, 2025

Uh oh!

openshift-ci bot commented Oct 10, 2025

Uh oh!

arkadeepsen commented Oct 14, 2025

Uh oh!

openshift-ci bot commented Oct 14, 2025

Uh oh!

openshift-ci-robot commented Oct 14, 2025

Uh oh!

kyrtapz commented Oct 16, 2025

Uh oh!

openshift-ci bot commented Oct 16, 2025

Uh oh!

huiran0826 commented Oct 17, 2025

Uh oh!

openshift-ci-robot commented Oct 17, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 17, 2025

Uh oh!

arkadeepsen commented Oct 17, 2025

Uh oh!

openshift-cherrypick-robot commented Oct 17, 2025

Uh oh!

openshift-merge-robot commented Oct 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

arkadeepsen commented Oct 9, 2025 •

edited

Loading