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.

Sign up for GitHub

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

Jump to bottom

OCPBUGS-14784: Honor global ingress configuration LoadBalancer type on AWS #2669

Merged
merged 1 commit into from Jun 9, 2023
Merged

OCPBUGS-14784: Honor global ingress configuration LoadBalancer type on AWS #2669

merged 1 commit into from Jun 9, 2023

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Jun 9, 2023

What this PR does / why we need it:
The ingress.config.openshift.io API allows setting the type of LoadBalancer to use for AWS ingress. This commit honors that setting when creating the initial default IngressController for clusters on AWS.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #OCPBUGS-14784

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes unit tests.

@csrwng
Honor global ingress configuration LoadBalancer type on AWS
9c0cea7 
The ingress.config.openshift.io API allows setting the type of
LoadBalancer to use for AWS ingress. This commit honors that setting
when creating the initial default IngressController for clusters on AWS.
@openshift-ci-robot 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 Jun 9, 2023
@openshift-ci-robot
Copy link

@csrwng: This pull request references Jira Issue OCPBUGS-14784, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

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:

What this PR does / why we need it:
The ingress.config.openshift.io API allows setting the type of LoadBalancer to use for AWS ingress. This commit honors that setting when creating the initial default IngressController for clusters on AWS.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #OCPBUGS-14784

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes unit tests.

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 openshift-ci bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Jun 9, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng

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

@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Jun 9, 2023
@csrwng
Copy link
Contributor Author

csrwng commented Jun 9, 2023

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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 Jun 9, 2023
@openshift-ci-robot
Copy link

@csrwng: This pull request references Jira Issue OCPBUGS-14784, 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)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiezhao@redhat.com), skipping review request.

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 kubernetes/test-infra repository.

sjenning
sjenning reviewed Jun 9, 2023
View reviewed changes
support/globalconfig/ingress.go
}

func IngressDomain(hcp *hyperv1.HostedControlPlane) string {
if hcp.Spec.Configuration != nil && hcp.Spec.Configuration.Ingress != nil {
if len(hcp.Spec.Configuration.Ingress.AppsDomain) > 0 {
return hcp.Spec.Configuration.Ingress.AppsDomain
}
return hcp.Spec.Configuration.Ingress.Domain
if len(hcp.Spec.Configuration.Ingress.Domain) > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

This seems like an unrelated change where if hcp.Spec.Configuration.Ingress != nil but hcp.Spec.Configuration.Ingress.Domain is not set, we default to the apps.$baseDomain rather than returning "".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's related in that if you only specify only the NLB setting in config, we end up with a blank domain, unless you also specify it.

@sjenning
Copy link
Contributor

sjenning commented Jun 9, 2023

/lgtm
/override "Red Hat Trusted App Pipeline / hypershift-operator-main-on-pull-request"

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 9, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2023

@sjenning: Overrode contexts on behalf of sjenning: Red Hat Trusted App Pipeline / hypershift-operator-main-on-pull-request

In response to this:

/lgtm
/override "Red Hat Trusted App Pipeline / hypershift-operator-main-on-pull-request"

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-merge-robot openshift-merge-robot merged commit 74e5667 into openshift:main Jun 9, 2023
11 of 13 checks passed
@openshift-ci-robot
Copy link

@csrwng: Jira Issue OCPBUGS-14784: All pull requests linked via external trackers have merged:

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

In response to this:

What this PR does / why we need it:
The ingress.config.openshift.io API allows setting the type of LoadBalancer to use for AWS ingress. This commit honors that setting when creating the initial default IngressController for clusters on AWS.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #OCPBUGS-14784

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes unit tests.

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.

@csrwng
Copy link
Contributor Author

csrwng commented Jun 12, 2023

/cherry-pick release-4.13

@csrwng
Copy link
Contributor Author

csrwng commented Jun 12, 2023

/cherry-pick release-4.12

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 12, 2023
Merged
@openshift-cherrypick-robot
Copy link

@csrwng: new pull request created: #2677

In response to this:

/cherry-pick release-4.13

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-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 12, 2023
Merged
@openshift-cherrypick-robot
Copy link

@csrwng: new pull request created: #2678

In response to this:

/cherry-pick release-4.12

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.

@csrwng csrwng deleted the honor_ingress_lb_config branch July 14, 2023 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjenning sjenning sjenning left review comments

@isco-rodriguez isco-rodriguez Awaiting requested review from isco-rodriguez

Assignees

@sjenning sjenning

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@csrwng @openshift-ci-robot @sjenning @openshift-cherrypick-robot @openshift-merge-robot