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

HO: Fix haproxy to have apiserver external address for public clusters #1649

Merged
merged 1 commit into from
Aug 4, 2022

Conversation

alvaroaleman
Copy link
Contributor

This was accidentally removed in
https://github.com/openshift/hypershift/pull/1614/files#diff-8d5b507fe367a80159912e2310bc3e7b76a5aa9dd1f12ccee7a1bf3a9bc2ac49
and breaks public clusters.

What this PR does / why we need it:

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 #

Checklist

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

@openshift-ci openshift-ci bot requested review from csrwng and enxebre August 4, 2022 04:08
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 4, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alvaroaleman

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 4, 2022
@netlify
Copy link

netlify bot commented Aug 4, 2022

Deploy Preview for hypershift-docs ready!

Name Link
🔨 Latest commit 872415d
🔍 Latest deploy log https://app.netlify.com/sites/hypershift-docs/deploys/62ebc2a9e33cb60008b0850a
😎 Deploy Preview https://deploy-preview-1649--hypershift-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@alvaroaleman
Copy link
Contributor Author

/retest-required

@@ -62,6 +65,27 @@ func (r *NodePoolReconciler) reconcileHAProxyIgnitionConfig(ctx context.Context,
apiServerExternalPort := util.APIPortWithDefaultFromHostedCluster(hcluster, config.DefaultAPIServerPort)
if util.IsPrivateHC(hcluster) {
apiServerExternalAddress = fmt.Sprintf("api.%s.hypershift.local", hcluster.Name)
} else {
Copy link
Member

@enxebre enxebre Aug 4, 2022

Choose a reason for hiding this comment

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

can we have a unit tested getAPIServerExternalAddress that covers this if/else so we don't drop by accident again?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 4, 2022

@alvaroaleman: all tests passed!

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.

@enxebre
Copy link
Member

enxebre commented Aug 4, 2022

/lgtm
so we fix broken public and follow up with test.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 4, 2022
@openshift-ci openshift-ci bot merged commit dfff72a into openshift:main Aug 4, 2022
@alvaroaleman alvaroaleman deleted the fix-1 branch August 4, 2022 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants