Skip to content

OCPBUGS-98571: Skip Azure topology LB scope override for ARO HCP IngressController #8992

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

Merged
openshift-merge-bot merged 2 commits into from
Jul 14, 2026
+92 −0
Merged

OCPBUGS-98571: Skip Azure topology LB scope override for ARO HCP IngressController #8992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db2ba67
fix: exclude ARO HCP from internal LB scope for PublicAndPrivate topo…
zgalor Jul 13, 2026
9f47b30
test: add ARO HCP ingress LB scope unit tests
bryan-cox Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions control-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ingress

import (
hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
"github.com/openshift/hypershift/support/azureutil"
"github.com/openshift/hypershift/support/globalconfig"

configv1 "github.com/openshift/api/config/v1"
Expand Down Expand Up @@ -47,7 +48,12 @@ func NewIngressParams(hcp *hyperv1.HostedControlPlane) *IngressParams {
loadBalancerScope = v1.InternalLoadBalancer
}
}
// For self-managed Azure clusters, set internal LB scope when topology
// requires private connectivity. ARO HCP clusters are excluded because
// they use shared ingress — the guest cluster's ingress operator should
// not create a per-cluster internal LB that bypasses the shared router.
if hcp.Spec.Platform.Type == hyperv1.AzurePlatform && hcp.Spec.Platform.Azure != nil &&
!azureutil.IsAroHCPByHCP(hcp) &&
(hcp.Spec.Platform.Azure.Topology == hyperv1.AzureTopologyPrivate ||
hcp.Spec.Platform.Azure.Topology == hyperv1.AzureTopologyPublicAndPrivate) {
loadBalancerScope = v1.InternalLoadBalancer
Expand Down
86 changes: 86 additions & 0 deletions ...l-plane-operator/hostedclusterconfigoperator/controllers/resources/ingress/params_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,92 @@ func TestNewIngressParams(t *testing.T) {
LoadBalancerScope: v1.InternalLoadBalancer,
},
},
{
name: "When ARO HCP Azure topology is PublicAndPrivate it should set external load balancer scope",
args: args{
hcp: &hyperv1.HostedControlPlane{
Spec: hyperv1.HostedControlPlaneSpec{
Platform: hyperv1.PlatformSpec{
Type: hyperv1.AzurePlatform,
Azure: &hyperv1.AzurePlatformSpec{
Topology: hyperv1.AzureTopologyPublicAndPrivate,
AzureAuthenticationConfig: hyperv1.AzureAuthenticationConfiguration{
AzureAuthenticationConfigType: hyperv1.AzureAuthenticationTypeManagedIdentities,
},
},
},
},
},
},
want: &IngressParams{
IngressSubdomain: "apps.",
Replicas: 1,
PlatformType: hyperv1.AzurePlatform,
IsPrivate: false,
IBMCloudUPI: false,
AWSNLB: false,
LoadBalancerScope: v1.ExternalLoadBalancer,
},
},
{
name: "When ARO HCP Azure topology is Private it should set external load balancer scope",
args: args{
hcp: &hyperv1.HostedControlPlane{
Spec: hyperv1.HostedControlPlaneSpec{
Platform: hyperv1.PlatformSpec{
Type: hyperv1.AzurePlatform,
Azure: &hyperv1.AzurePlatformSpec{
Topology: hyperv1.AzureTopologyPrivate,
AzureAuthenticationConfig: hyperv1.AzureAuthenticationConfiguration{
AzureAuthenticationConfigType: hyperv1.AzureAuthenticationTypeManagedIdentities,
},
},
},
},
},
},
want: &IngressParams{
IngressSubdomain: "apps.",
Replicas: 1,
PlatformType: hyperv1.AzurePlatform,
IsPrivate: false,
IBMCloudUPI: false,
AWSNLB: false,
LoadBalancerScope: v1.ExternalLoadBalancer,
},
},
{
name: "When ARO HCP has IngressControllerLoadBalancerScope annotation set to Internal it should respect it",
args: args{
hcp: &hyperv1.HostedControlPlane{
ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{
hyperv1.IngressControllerLoadBalancerScope: string(v1.InternalLoadBalancer),
},
},
Spec: hyperv1.HostedControlPlaneSpec{
Platform: hyperv1.PlatformSpec{
Type: hyperv1.AzurePlatform,
Azure: &hyperv1.AzurePlatformSpec{
Topology: hyperv1.AzureTopologyPublicAndPrivate,
AzureAuthenticationConfig: hyperv1.AzureAuthenticationConfiguration{
AzureAuthenticationConfigType: hyperv1.AzureAuthenticationTypeManagedIdentities,
},
},
},
},
},
},
want: &IngressParams{
IngressSubdomain: "apps.",
Replicas: 1,
PlatformType: hyperv1.AzurePlatform,
IsPrivate: false,
IBMCloudUPI: false,
AWSNLB: false,
LoadBalancerScope: v1.InternalLoadBalancer,
},
},
{
name: "When Azure endpoint access is Public it should set external load balancer scope",
args: args{
Expand Down