Skip to content

Commit

Permalink
skip lb profile reconcile when arch is v1 (#3162)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tony-schndr
tony-schndr authored Sep 12, 2023
1 parent b1db194 commit 46fa0a1
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 17 deletions.
2 changes: 1 addition & 1 deletion pkg/cluster/loadbalancerprofile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
const outboundRuleV4 = "outbound-rule-v4"

func (m *manager) reconcileLoadBalancerProfile(ctx context.Context) error {
if m.doc.OpenShiftCluster.Properties.NetworkProfile.OutboundType != api.OutboundTypeLoadbalancer {
if m.doc.OpenShiftCluster.Properties.NetworkProfile.OutboundType != api.OutboundTypeLoadbalancer || m.doc.OpenShiftCluster.Properties.ArchitectureVersion == api.ArchitectureVersionV1 {
return nil
}

Expand Down
69 changes: 53 additions & 16 deletions pkg/cluster/loadbalancerprofile_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,14 +448,44 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
name string
m manager
lb mgmtnetwork.LoadBalancer
expectedLoadBalancerProfile api.LoadBalancerProfile
expectedLoadBalancerProfile *api.LoadBalancerProfile
uuids []string
mocks func(
loadBalancersClient *mock_network.MockLoadBalancersClient,
publicIPAddressClient *mock_network.MockPublicIPAddressesClient,
ctx context.Context)
expectedErr []error
}{
{
name: "reconcile is skipped when architecture version is V1",
uuids: []string{},
m: manager{
doc: &api.OpenShiftClusterDocument{
Key: strings.ToLower(key),
OpenShiftCluster: &api.OpenShiftCluster{
ID: key,
Location: location,
Properties: api.OpenShiftClusterProperties{
ArchitectureVersion: api.ArchitectureVersionV1,
ProvisioningState: api.ProvisioningStateUpdating,
ClusterProfile: api.ClusterProfile{
ResourceGroupID: clusterRGID,
},
InfraID: infraID,
APIServerProfile: api.APIServerProfile{
Visibility: api.VisibilityPublic,
},
NetworkProfile: api.NetworkProfile{
OutboundType: api.OutboundTypeLoadbalancer,
LoadBalancerProfile: nil,
},
},
},
},
},
expectedLoadBalancerProfile: nil,
expectedErr: nil,
},
{
name: "default managed ips",
uuids: []string{},
Expand All @@ -466,7 +496,8 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
ID: key,
Location: location,
Properties: api.OpenShiftClusterProperties{
ProvisioningState: api.ProvisioningStateUpdating,
ArchitectureVersion: api.ArchitectureVersionV2,
ProvisioningState: api.ProvisioningStateUpdating,
ClusterProfile: api.ClusterProfile{
ResourceGroupID: clusterRGID,
},
Expand Down Expand Up @@ -503,7 +534,7 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
Get(gomock.Any(), clusterRGName, infraID, "").
Return(fakeLoadBalancersGet(0, api.VisibilityPublic), nil)
},
expectedLoadBalancerProfile: api.LoadBalancerProfile{
expectedLoadBalancerProfile: &api.LoadBalancerProfile{
ManagedOutboundIPs: &api.ManagedOutboundIPs{
Count: 1,
},
Expand All @@ -525,7 +556,8 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
ID: key,
Location: location,
Properties: api.OpenShiftClusterProperties{
ProvisioningState: api.ProvisioningStateUpdating,
ProvisioningState: api.ProvisioningStateUpdating,
ArchitectureVersion: api.ArchitectureVersionV2,
ClusterProfile: api.ClusterProfile{
ResourceGroupID: clusterRGID,
},
Expand Down Expand Up @@ -567,7 +599,7 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
Get(gomock.Any(), clusterRGName, infraID, "").
Return(fakeLoadBalancersGet(1, api.VisibilityPublic), nil)
},
expectedLoadBalancerProfile: api.LoadBalancerProfile{
expectedLoadBalancerProfile: &api.LoadBalancerProfile{
ManagedOutboundIPs: &api.ManagedOutboundIPs{
Count: 2,
},
Expand All @@ -592,7 +624,8 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
ID: key,
Location: location,
Properties: api.OpenShiftClusterProperties{
ProvisioningState: api.ProvisioningStateUpdating,
ArchitectureVersion: api.ArchitectureVersionV2,
ProvisioningState: api.ProvisioningStateUpdating,
ClusterProfile: api.ClusterProfile{
ResourceGroupID: clusterRGID,
},
Expand Down Expand Up @@ -638,7 +671,7 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
Get(gomock.Any(), clusterRGName, infraID, "").
Return(fakeLoadBalancersGet(1, api.VisibilityPublic), nil)
},
expectedLoadBalancerProfile: api.LoadBalancerProfile{
expectedLoadBalancerProfile: &api.LoadBalancerProfile{
ManagedOutboundIPs: &api.ManagedOutboundIPs{
Count: 2,
},
Expand All @@ -664,7 +697,8 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
ID: key,
Location: location,
Properties: api.OpenShiftClusterProperties{
ProvisioningState: api.ProvisioningStateUpdating,
ProvisioningState: api.ProvisioningStateUpdating,
ArchitectureVersion: api.ArchitectureVersionV2,
ClusterProfile: api.ClusterProfile{
ResourceGroupID: clusterRGID,
},
Expand Down Expand Up @@ -713,7 +747,7 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
publicIPAddressClient.EXPECT().DeleteAndWait(gomock.Any(), "clusterRG", "uuid1-outbound-pip-v4")
},

expectedLoadBalancerProfile: api.LoadBalancerProfile{
expectedLoadBalancerProfile: &api.LoadBalancerProfile{
ManagedOutboundIPs: &api.ManagedOutboundIPs{
Count: 1,
},
Expand All @@ -735,7 +769,8 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
ID: key,
Location: location,
Properties: api.OpenShiftClusterProperties{
ProvisioningState: api.ProvisioningStateUpdating,
ProvisioningState: api.ProvisioningStateUpdating,
ArchitectureVersion: api.ArchitectureVersionV2,
ClusterProfile: api.ClusterProfile{
ResourceGroupID: clusterRGID,
},
Expand Down Expand Up @@ -782,7 +817,7 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
Return(fakeLoadBalancersGet(0, api.VisibilityPublic), nil)
publicIPAddressClient.EXPECT().DeleteAndWait(gomock.Any(), "clusterRG", "uuid1-outbound-pip-v4")
},
expectedLoadBalancerProfile: api.LoadBalancerProfile{
expectedLoadBalancerProfile: &api.LoadBalancerProfile{
ManagedOutboundIPs: &api.ManagedOutboundIPs{
Count: 2,
},
Expand All @@ -804,7 +839,8 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
ID: key,
Location: location,
Properties: api.OpenShiftClusterProperties{
ProvisioningState: api.ProvisioningStateUpdating,
ProvisioningState: api.ProvisioningStateUpdating,
ArchitectureVersion: api.ArchitectureVersionV2,
ClusterProfile: api.ClusterProfile{
ResourceGroupID: clusterRGID,
},
Expand Down Expand Up @@ -856,7 +892,7 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
publicIPAddressClient.EXPECT().DeleteAndWait(gomock.Any(), "clusterRG", "uuid1-outbound-pip-v4").Return(fmt.Errorf("error"))
publicIPAddressClient.EXPECT().DeleteAndWait(gomock.Any(), "clusterRG", "uuid2-outbound-pip-v4").Return(fmt.Errorf("error"))
},
expectedLoadBalancerProfile: api.LoadBalancerProfile{
expectedLoadBalancerProfile: &api.LoadBalancerProfile{
ManagedOutboundIPs: &api.ManagedOutboundIPs{
Count: 1,
},
Expand All @@ -878,7 +914,8 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
ID: key,
Location: location,
Properties: api.OpenShiftClusterProperties{
ProvisioningState: api.ProvisioningStateUpdating,
ProvisioningState: api.ProvisioningStateUpdating,
ArchitectureVersion: api.ArchitectureVersionV2,
ClusterProfile: api.ClusterProfile{
ResourceGroupID: clusterRGID,
},
Expand Down Expand Up @@ -927,7 +964,7 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
Return(fakeLoadBalancersGet(0, api.VisibilityPublic), nil)
publicIPAddressClient.EXPECT().DeleteAndWait(gomock.Any(), "clusterRG", "uuid1-outbound-pip-v4").Return(fmt.Errorf("error"))
},
expectedLoadBalancerProfile: api.LoadBalancerProfile{
expectedLoadBalancerProfile: &api.LoadBalancerProfile{
ManagedOutboundIPs: &api.ManagedOutboundIPs{
Count: 3,
},
Expand Down Expand Up @@ -972,7 +1009,7 @@ func TestReconcileLoadBalancerProfile(t *testing.T) {
} else {
assert.Equal(t, nil, err, "Unexpected error exception")
}
assert.Equal(t, &tt.expectedLoadBalancerProfile, tt.m.doc.OpenShiftCluster.Properties.NetworkProfile.LoadBalancerProfile)
assert.Equal(t, &tt.expectedLoadBalancerProfile, &tt.m.doc.OpenShiftCluster.Properties.NetworkProfile.LoadBalancerProfile)
})
}
}
Expand Down

0 comments on commit 46fa0a1

Please sign in to comment.