OCPBUGS-15978: Check public DNS zone when reporting status #967

Miciah · 2023-07-20T21:52:10Z

When reporting the "DNSReady" status condition on an IngressController, check the status conditions for both the public zone and the private zone of the associated DNSRecord.

Before this change, only the status condition for the private zone was used to compute the "DNSReady" status condition. If the operator failed to publish a DNS record in the public zone, this failure was not reported in the IngressController's status conditions or the "ingress" clusteroperator status conditions.

Follow-up to #641.

pkg/operator/controller/ingress/status.go (checkZoneInConfig): Use the new zonesMatch helper function to check both the public zone as well as the private zone.
(zonesMatch): New function. Return a Boolean value indicating whether two DNS zones match, based on their respective ID or "Name" tags.
pkg/operator/controller/ingress/status_test.go (Test_checkZoneInConfig): Verify that checkZoneInConfig checks the public zone as well as the private zone. Delete "[PrivateZone]" from test-case descriptions as each test case is now tested as both a public zone and a private zone.

~~/hold~~
Rebase after #880 merges.

openshift-ci-robot · 2023-07-20T21:52:18Z

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

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @lihongan

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

In response to this:

When reporting the "DNSReady" status condition on an IngressController, check the status conditions for both the public zone and the private zone of the associated DNSRecord.

Before this change, only the status condition for the private zone was used to compute the "DNSReady" status condition. If the operator failed to publish a DNS record in the public zone, this failure was not reported in the IngressController's status conditions or the "ingress" clusteroperator status conditions.

Follow-up to #641.

pkg/operator/controller/ingress/status.go (checkZoneInConfig): Use the new zonesMatch helper function to check both the public zone as well as the private zone.
(zonesMatch): New function. Return a Boolean value indicating whether two DNS zones match, based on their respective ID or "Name" tags.

pkg/operator/controller/ingress/status_test.go (TestZoneInConfig): Verify that checkZoneInConfig checks the public zone as well as the private zone.

/hold
Rebase after #880 merges.

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

openshift-ci-robot · 2023-07-24T13:23:20Z

@Miciah: This pull request references Jira Issue OCPBUGS-15978, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @lihongan

In response to this:

When reporting the "DNSReady" status condition on an IngressController, check the status conditions for both the public zone and the private zone of the associated DNSRecord.

Before this change, only the status condition for the private zone was used to compute the "DNSReady" status condition. If the operator failed to publish a DNS record in the public zone, this failure was not reported in the IngressController's status conditions or the "ingress" clusteroperator status conditions.

Follow-up to #641.

pkg/operator/controller/ingress/status.go (checkZoneInConfig): Use the new zonesMatch helper function to check both the public zone as well as the private zone.
(zonesMatch): New function. Return a Boolean value indicating whether two DNS zones match, based on their respective ID or "Name" tags.

pkg/operator/controller/ingress/status_test.go (Test_checkZoneInConfig): Verify that checkZoneInConfig checks the public zone as well as the private zone.

/hold
Rebase after #880 merges.

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

openshift-ci-robot · 2023-07-24T13:23:29Z

@Miciah: This pull request references Jira Issue OCPBUGS-15978, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @lihongan

In response to this:

When reporting the "DNSReady" status condition on an IngressController, check the status conditions for both the public zone and the private zone of the associated DNSRecord.

Before this change, only the status condition for the private zone was used to compute the "DNSReady" status condition. If the operator failed to publish a DNS record in the public zone, this failure was not reported in the IngressController's status conditions or the "ingress" clusteroperator status conditions.

Follow-up to #641.

pkg/operator/controller/ingress/status.go (checkZoneInConfig): Use the new zonesMatch helper function to check both the public zone as well as the private zone.
(zonesMatch): New function. Return a Boolean value indicating whether two DNS zones match, based on their respective ID or "Name" tags.

pkg/operator/controller/ingress/status_test.go (Test_checkZoneInConfig): Verify that checkZoneInConfig checks the public zone as well as the private zone.

~~/hold~~
Rebase after #880 merges.

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

Miciah · 2023-07-24T13:23:39Z

https://github.com/openshift/cluster-ingress-operator/compare/9f9e4efeabb38fb31aae32f3d54313e00662b906..04e74bd30f2438729d7ed8d22f63b1b8ce25d01b rebases for #880.
/hold cancel

candita · 2023-07-26T15:47:07Z

/assign

candita · 2023-08-15T21:19:41Z

pkg/operator/controller/ingress/status_test.go

Now that you're testing the public zone too, maybe you should adjust the test description prefixes to something other than "[PrivateZone]".

Thanks! Fixed in https://github.com/openshift/cluster-ingress-operator/compare/04e74bd30f2438729d7ed8d22f63b1b8ce25d01b..55780444031714fc931d90af298a4b193888977a.

candita · 2023-08-15T21:21:51Z

pkg/operator/controller/ingress/status.go

-		if dnsConfig.Spec.PrivateZone.ID == zone.ID {
-			return true
-		}
+	return zonesMatch(&zone, dnsConfig.Spec.PublicZone) || zonesMatch(&zone, dnsConfig.Spec.PrivateZone)


Is this guaranteed to run the second half of the conjunction if the first half is true? In other words, will it just stop evaluating if the public zone matches? Also, is it possible for there to be both a Spec.PublicZone and Spec.PrivateZone , so that we'd want to use && rather than ||?

I get it now. You can disregard this.

candita · 2023-08-15T21:34:10Z

It just needs a new description for the unit tests.

/approve

openshift-ci · 2023-08-15T21:40:48Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: candita

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

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

candita · 2023-08-15T21:45:01Z

Noticed quite alot of ssh failures, try again.

core@10.0.141.24: Permission denied (publickey,gssapi-keyex,gssapi-with-mic).
Failed to ssh to AWS instance, dumping ssh configuration
Attempt #1: ssh -F /tmp/tmp.KScJF3KjtJ -n machine sudo journalctl > /tmp/journal.log && gzip -f /tmp/journal.log

/test e2e-hypershift

When reporting the "DNSReady" status condition on an IngressController, check the status conditions for both the public zone and the private zone of the associated DNSRecord. Before this commit, only the status condition for the private zone was used to compute the "DNSReady" status condition. If the operator failed to publish a DNS record in the public zone, this failure was not reported in the IngressController's status conditions or the "ingress" clusteroperator status conditions. Follow-up to commit 9f32923. This commit fixes OCPBUGS-15978. https://issues.redhat.com/browse/OCPBUGS-15978 * pkg/operator/controller/ingress/status.go (checkZoneInConfig): Use the new zonesMatch helper function to check both the public zone as well as the private zone. (zonesMatch): New function. Return a Boolean value indicating whether two DNS zones match, based on their respective ID or "Name" tags. * pkg/operator/controller/ingress/status_test.go (Test_checkZoneInConfig): Verify that checkZoneInConfig checks the public zone as well as the private zone. Delete "[PrivateZone]" from test-case descriptions as each test case is now tested as both a public zone and a private zone.

openshift-ci-robot · 2023-08-15T23:19:15Z

@Miciah: This pull request references Jira Issue OCPBUGS-15978, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @lihongan

In response to this:

When reporting the "DNSReady" status condition on an IngressController, check the status conditions for both the public zone and the private zone of the associated DNSRecord.

Before this change, only the status condition for the private zone was used to compute the "DNSReady" status condition. If the operator failed to publish a DNS record in the public zone, this failure was not reported in the IngressController's status conditions or the "ingress" clusteroperator status conditions.

Follow-up to #641.

pkg/operator/controller/ingress/status.go (checkZoneInConfig): Use the new zonesMatch helper function to check both the public zone as well as the private zone.
(zonesMatch): New function. Return a Boolean value indicating whether two DNS zones match, based on their respective ID or "Name" tags.

pkg/operator/controller/ingress/status_test.go (Test_checkZoneInConfig): Verify that checkZoneInConfig checks the public zone as well as the private zone. Delete "[PrivateZone]" from test-case descriptions as each test case is now tested as both a public zone and a private zone.

~~/hold~~
Rebase after #880 merges.

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

Miciah · 2023-08-15T23:20:05Z

https://github.com/openshift/cluster-ingress-operator/compare/04e74bd30f2438729d7ed8d22f63b1b8ce25d01b..55780444031714fc931d90af298a4b193888977a deletes "[PrivateZone]" from test-case descriptions as each test case is now tested as both a public zone and a private zone.

candita · 2023-08-16T00:18:20Z

/lgtm

openshift-ci · 2023-08-16T01:46:23Z

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

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-azure-ovn	`5578044`	link	false	`/test e2e-azure-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/test-infra repository. I understand the commands that are listed here.

openshift-ci-robot · 2023-08-16T01:51:01Z

@Miciah: Jira Issue OCPBUGS-15978: All pull requests linked via external trackers have merged:

openshift/cluster-ingress-operator#967

Jira Issue OCPBUGS-15978 has been moved to the MODIFIED state.

In response to this:

When reporting the "DNSReady" status condition on an IngressController, check the status conditions for both the public zone and the private zone of the associated DNSRecord.

Before this change, only the status condition for the private zone was used to compute the "DNSReady" status condition. If the operator failed to publish a DNS record in the public zone, this failure was not reported in the IngressController's status conditions or the "ingress" clusteroperator status conditions.

Follow-up to #641.

pkg/operator/controller/ingress/status.go (checkZoneInConfig): Use the new zonesMatch helper function to check both the public zone as well as the private zone.
(zonesMatch): New function. Return a Boolean value indicating whether two DNS zones match, based on their respective ID or "Name" tags.

pkg/operator/controller/ingress/status_test.go (Test_checkZoneInConfig): Verify that checkZoneInConfig checks the public zone as well as the private zone. Delete "[PrivateZone]" from test-case descriptions as each test case is now tested as both a public zone and a private zone.

~~/hold~~
Rebase after #880 merges.

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

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

openshift-ci bot requested review from lihongan, candita and rfredette July 20, 2023 21:52

Miciah force-pushed the OCPBUGS-15978-check-public-DNS-zone-when-reporting-status branch from 9f9e4ef to 04e74bd Compare July 24, 2023 13:23

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

openshift-ci bot assigned candita Jul 26, 2023

candita reviewed Aug 15, 2023

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 15, 2023

Miciah force-pushed the OCPBUGS-15978-check-public-DNS-zone-when-reporting-status branch from 04e74bd to 5578044 Compare August 15, 2023 23:19

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

openshift-merge-robot merged commit cd97771 into openshift:master Aug 16, 2023
13 of 14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-15978: Check public DNS zone when reporting status #967

OCPBUGS-15978: Check public DNS zone when reporting status #967

Miciah commented Jul 20, 2023 •

edited

openshift-ci-robot commented Jul 20, 2023

openshift-ci-robot commented Jul 24, 2023

openshift-ci-robot commented Jul 24, 2023

Miciah commented Jul 24, 2023

candita commented Jul 26, 2023

candita Aug 15, 2023

Miciah Aug 15, 2023

candita Aug 15, 2023 •

edited

candita Aug 15, 2023

candita commented Aug 15, 2023

openshift-ci bot commented Aug 15, 2023

candita commented Aug 15, 2023

openshift-ci-robot commented Aug 15, 2023

Miciah commented Aug 15, 2023

candita commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023

openshift-ci-robot commented Aug 16, 2023

OCPBUGS-15978: Check public DNS zone when reporting status #967

OCPBUGS-15978: Check public DNS zone when reporting status #967

Conversation

Miciah commented Jul 20, 2023 • edited

openshift-ci-robot commented Jul 20, 2023

openshift-ci-robot commented Jul 24, 2023

openshift-ci-robot commented Jul 24, 2023

Miciah commented Jul 24, 2023

candita commented Jul 26, 2023

candita Aug 15, 2023

Choose a reason for hiding this comment

Miciah Aug 15, 2023

Choose a reason for hiding this comment

candita Aug 15, 2023 • edited

Choose a reason for hiding this comment

candita Aug 15, 2023

Choose a reason for hiding this comment

candita commented Aug 15, 2023

openshift-ci bot commented Aug 15, 2023

candita commented Aug 15, 2023

openshift-ci-robot commented Aug 15, 2023

Miciah commented Aug 15, 2023

candita commented Aug 16, 2023

openshift-ci bot commented Aug 16, 2023

openshift-ci-robot commented Aug 16, 2023

Miciah commented Jul 20, 2023 •

edited

candita Aug 15, 2023 •

edited