OCPBUGS-57364: custom-dns: Set PrivateZone and PublicZone to nil in the DNS manifest#9886
Conversation
sadasu
changed the title
openshift-ci-robot
added
jira/severity-critical
|
@sadasu: This pull request references Jira Issue OCPBUGS-57364, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn 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. |
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
|
@sadasu: This pull request references Jira Issue OCPBUGS-57364, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (yunjiang@redhat.com), skipping review request. DetailsIn 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. |
patrickdillon
left a comment
patrickdillon
left a comment
There was a problem hiding this comment.
/approve
LGTM. Just need to remove the TODO
pkg/asset/cluster/tfvars/tfvars.go
Outdated
| // TODO: Does this have to be skipped when custom-dns is enabled? Afaik, DNS zones | ||
| // should not be created when custom-dns is enabled. But, AllZones() seem to be | ||
| // returning availability zones. |
There was a problem hiding this comment.
Correct, these are availability zones--not DNS zones. You can remove the TODO
|
/test ? |
|
@patrickdillon: The following commands are available to trigger required jobs: The following commands are available to trigger optional jobs: Use DetailsIn 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 kubernetes-sigs/prow repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: patrickdillon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
| if installConfig.Config.AWS.UserProvisionedDNS == dnstypes.UserProvisionedDNSEnabled { | ||
| config.Spec.PublicZone = &configv1.DNSZone{ID: ""} | ||
| config.Spec.PrivateZone = &configv1.DNSZone{ID: ""} | ||
| break | ||
| } |
There was a problem hiding this comment.
Looks like the additional if block is causing lint to fail (lint job):
level=info msg="[runner] linters took 2m53.907634623s with stages: goanalysis_metalinter: 1m2.136871718s"
pkg/asset/manifests/dns.go:70:1: cyclomatic complexity 31 of func `(*DNS).Generate` is high (> 30) (gocyclo)
func (d *DNS) Generate(ctx context.Context, dependencies asset.Parents) error {
^ Too many if?
There was a problem hiding this comment.
We can increase the threshold value: https://golangci-lint.run/docs/linters/configuration/#gocyclo
There was a problem hiding this comment.
or maybe just //nolint:gocyclo. Below passes lint check.
// Generate generates the DNS config and its CRD.
-func (d *DNS) Generate(ctx context.Context, dependencies asset.Parents) error {
+func (d *DNS) Generate(ctx context.Context, dependencies asset.Parents) error { //nolint:gocyclo
|
/test ? |
|
@gpei: The following commands are available to trigger required jobs: The following commands are available to trigger optional jobs: Use DetailsIn 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 kubernetes-sigs/prow repository. |
|
/test aws-custom-dns |
…NS manifest cluster-ingress-controller would skip creating DNS entries for the Ingress service when PrivateZone and PublicZone fields in the DNS manifest are not set.
|
/test e2e-gcp-custom-dns |
sadasu
changed the title
|
@sadasu: This pull request references Jira Issue OCPBUGS-57364, which is valid. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (yunjiang@redhat.com), skipping review request. The bug has been updated to refer to the pull request using the external bug tracker. This pull request references Jira Issue OCPBUGS-60492, which is valid. 3 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn 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. |
sadasu
changed the title
|
/retest-required |
|
@sadasu: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
According to Patrick's comment, this change is not entirely sufficient? But I guess the check makes sense! |
openshift-merge-bot
bot
merged commit 49780fa
into
openshift:main
|
@sadasu: Jira Issue OCPBUGS-57364: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-57364 has been moved to the MODIFIED state. DetailsIn 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. |
|
[ART PR BUILD NOTIFIER] Distgit: ose-baremetal-installer |
|
[ART PR BUILD NOTIFIER] Distgit: ose-installer |
|
[ART PR BUILD NOTIFIER] Distgit: ose-installer-artifacts |
|
@tthvo The issue seen in the ingress controller tests was determined to be an issue with their tests and not custom-dns code. So, openshift/cluster-ingress-operator#1269 (comment) is outdated and OK to merge this. |
|
Oh nice, sounds good! Thanks! |
|
Fix included in accepted release 4.21.0-0.nightly-2025-11-15-144034 |
7 participants
Not setting the PrivateZone and PublicZone fields in the DNS manifest would cause cluster-ingress-controller to skip creating DNS entries for the Ingress service when custom-dns is configured.