Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deduplicate the names for the additional domain names #3773

Merged
merged 2 commits into from
Jul 12, 2024

Conversation

houshengbo
Copy link
Contributor

@houshengbo houshengbo commented Jul 2, 2024

What this PR does / why we need it:

  • So far, if there are duplicate domain names defined in the additional domain names, or the same domain name defined in both additional domain names and the domain name, it leads to the error configuration is invalid: duplicate hosts in virtual service. This PR removes the duplicated domain name for both additional domain names and domain names.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #3756

Type of changes
Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

Feature/Issue validation/testing:

Please describe the tests that you ran to verify your changes and relevant result summary. Provide instructions so it can be reproduced.
Please also list any relevant details for your test configuration.

  • Test A

  • Test B

  • Logs

Special notes for your reviewer:

  1. Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Checklist:

  • Have you added unit/e2e tests that prove your fix is effective or that this feature works?
  • Has code been commented, particularly in hard-to-understand areas?
  • Have you made corresponding changes to the documentation?

Release note:


Re-running failed tests

  • /rerun-all - rerun all failed workflows.
  • /rerun-workflow <workflow name> - rerun a specific failed workflow. Only one workflow name can be specified. Multiple /rerun-workflow commands are allowed per comment.

Signed-off-by: Vincent Hou <shou73@bloomberg.net>
@houshengbo houshengbo force-pushed the deduplicate-domain branch from c255725 to d72f764 Compare July 2, 2024 16:47
Signed-off-by: Vincent Hou <shou73@bloomberg.net>
@greenmoon55
Copy link
Contributor

Could you fill in the all the sections in the PR description? like What this PR does / why we need it:, Feature/Issue validation/testing and Release Note?

"Failed to get the valid host name")
continue
// If the domain is redundant, go to the next element.
if !deduplicateMap[domain] {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just to confirm for boolean map this is good enough, we do not need to check the existence flag.

Copy link
Contributor Author

@houshengbo houshengbo Jul 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is good use of the boolean map.
If domain exists, the value is true; if it does not exist, the value is false.

Comment on lines +338 to +341
if stringMatchEqual(matchRequest.Authority, matchRequestEle.Authority) && gatewaysEqual(matchRequest, matchRequestEle) &&
stringMatchEqual(matchRequest.Uri, matchRequestEle.Uri) {
return true
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we can't perform deepEqual directly on HTTPMatchRequest ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I tried. It seems I have to break them and check the field one by one with this approach.

@yuzisun
Copy link
Member

yuzisun commented Jul 12, 2024

/lgtm
/approve

Copy link

oss-prow-bot bot commented Jul 12, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: houshengbo, yuzisun

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:

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

@yuzisun yuzisun merged commit 1a70e11 into kserve:master Jul 12, 2024
56 of 58 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

duplicated hosts error after configuring the additional domains
3 participants