Skip to content

Commit 36898ea

Browse files
mociarainmociarain
authored
Merge pull request #4340 from Azure/aasserzo/ARO-19806-part3-cleanup
ARO-19806 part 3 - cleanup old mgmt/network package
2 parents 5092247 + e7d327b commit 36898ea

27 files changed

+31
-1216
lines changed

‎pkg/cluster/cluster.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import (
5252
"github.com/Azure/ARO-RP/pkg/util/platformworkloadidentity"
5353
"github.com/Azure/ARO-RP/pkg/util/refreshable"
5454
"github.com/Azure/ARO-RP/pkg/util/storage"
55-
"github.com/Azure/ARO-RP/pkg/util/subnet"
5655
"github.com/Azure/ARO-RP/pkg/util/token"
5756
)
5857

@@ -104,7 +103,6 @@ type manager struct {
104103

105104
dns dns.Manager
106105
storage storage.Manager
107-
subnet subnet.Manager // TODO: use armSubnets instead. https://issues.redhat.com/browse/ARO-4665
108106
graph graph.Manager
109107
rpBlob blob.Manager
110108

@@ -295,7 +293,6 @@ func New(ctx context.Context, log *logrus.Entry, _env env.Interface, db database
295293

296294
dns: dns.NewManager(_env, fpCredRPTenant),
297295
storage: storage,
298-
subnet: subnet.NewManager(_env.Environment(), r.SubscriptionID, fpAuthorizer),
299296
graph: graph.NewManager(_env, log, aead, storage),
300297
rpBlob: rpBlob,
301298
installViaHive: installViaHive,

‎pkg/cluster/delete.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (m *manager) disconnectSecurityGroup(ctx context.Context, resourceID string
100100
}
101101
}
102102

103-
subnetResp, err := m.armSubnets.Get(ctx, r.ResourceGroupName, r.Parent.Name, r.Name, nil)
103+
subnetResponse, err := m.armSubnets.Get(ctx, r.ResourceGroupName, r.Parent.Name, r.Name, nil)
104104
if err != nil {
105105
b, _ := json.Marshal(err)
106106

@@ -118,7 +118,7 @@ func (m *manager) disconnectSecurityGroup(ctx context.Context, resourceID string
118118
}
119119
}
120120

121-
s := subnetResp.Subnet
121+
s := subnetResponse.Subnet
122122

123123
if s.Properties == nil || s.Properties.NetworkSecurityGroup == nil ||
124124
!strings.EqualFold(*s.Properties.NetworkSecurityGroup.ID, *nsg.ID) {

‎pkg/cluster/deploybaseresources.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,11 +440,11 @@ func (m *manager) setMasterSubnetPolicies(ctx context.Context) error {
440440
return err
441441
}
442442

443-
subnetResp, err := m.armSubnets.Get(ctx, r.ResourceGroupName, r.Parent.Name, r.Name, nil)
443+
subnetResponse, err := m.armSubnets.Get(ctx, r.ResourceGroupName, r.Parent.Name, r.Name, nil)
444444
if err != nil {
445445
return err
446446
}
447-
s := subnetResp.Subnet
447+
s := subnetResponse.Subnet
448448

449449
if s.Properties == nil {
450450
s.Properties = &armnetwork.SubnetPropertiesFormat{}

‎pkg/operator/controllers/previewfeature/nsgflowlogs/nsgflowlogs_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313

1414
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6"
1515

16+
"github.com/Azure/ARO-RP/pkg/api/util/subnet"
1617
aropreviewv1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/preview.aro.openshift.io/v1alpha1"
1718
mock_armnetwork "github.com/Azure/ARO-RP/pkg/util/mocks/azureclient/azuresdk/armnetwork"
1819
mock_subnet "github.com/Azure/ARO-RP/pkg/util/mocks/subnet"
1920
"github.com/Azure/ARO-RP/pkg/util/pointerutils"
20-
"github.com/Azure/ARO-RP/pkg/util/subnet"
2121
utilerror "github.com/Azure/ARO-RP/test/util/error"
2222
)
2323

‎pkg/operator/controllers/storageaccounts/storageaccounts_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ import (
2323
imageregistryv1 "github.com/openshift/api/imageregistry/v1"
2424

2525
"github.com/Azure/ARO-RP/pkg/api"
26-
apisubnet "github.com/Azure/ARO-RP/pkg/api/util/subnet"
26+
"github.com/Azure/ARO-RP/pkg/api/util/subnet"
2727
"github.com/Azure/ARO-RP/pkg/operator"
2828
arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1"
2929
mock_armnetwork "github.com/Azure/ARO-RP/pkg/util/mocks/azureclient/azuresdk/armnetwork"
3030
mock_storage "github.com/Azure/ARO-RP/pkg/util/mocks/azureclient/mgmt/storage"
3131
mock_subnet "github.com/Azure/ARO-RP/pkg/util/mocks/subnet"
3232
"github.com/Azure/ARO-RP/pkg/util/pointerutils"
3333
_ "github.com/Azure/ARO-RP/pkg/util/scheme"
34-
"github.com/Azure/ARO-RP/pkg/util/subnet"
3534
)
3635

3736
var (
@@ -44,7 +43,7 @@ var (
4443
vnetName = "vnet"
4544
subnetNameWorker = "worker"
4645
subnetNameMaster = "master"
47-
nsgv1MasterResourceId = clusterResourceGroupId + "/providers/Microsoft.Network/networkSecurityGroups/" + infraId + apisubnet.NSGControlPlaneSuffixV1
46+
nsgv1MasterResourceId = clusterResourceGroupId + "/providers/Microsoft.Network/networkSecurityGroups/" + infraId + subnet.NSGControlPlaneSuffixV1
4847

4948
storageSuffix = "random-suffix"
5049
clusterStorageAccountName = "cluster" + storageSuffix

‎pkg/operator/controllers/subnets/subnet_controller_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ import (
2121
"github.com/Azure/go-autorest/autorest"
2222

2323
"github.com/Azure/ARO-RP/pkg/api"
24-
apisubnet "github.com/Azure/ARO-RP/pkg/api/util/subnet"
24+
"github.com/Azure/ARO-RP/pkg/api/util/subnet"
2525
"github.com/Azure/ARO-RP/pkg/operator"
2626
arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1"
2727
mock_armnetwork "github.com/Azure/ARO-RP/pkg/util/mocks/azureclient/azuresdk/armnetwork"
2828
mock_subnet "github.com/Azure/ARO-RP/pkg/util/mocks/subnet"
2929
"github.com/Azure/ARO-RP/pkg/util/pointerutils"
3030
_ "github.com/Azure/ARO-RP/pkg/util/scheme"
31-
"github.com/Azure/ARO-RP/pkg/util/subnet"
3231
)
3332

3433
var (
@@ -42,9 +41,9 @@ var (
4241
subnetNameMaster = "master"
4342
subnetNameWorkerInvalid = "worker-invalid"
4443

45-
nsgv1NodeResourceId = clusterResourceGroupId + "/providers/Microsoft.Network/networkSecurityGroups/" + infraId + apisubnet.NSGNodeSuffixV1
46-
nsgv1MasterResourceId = clusterResourceGroupId + "/providers/Microsoft.Network/networkSecurityGroups/" + infraId + apisubnet.NSGControlPlaneSuffixV1
47-
nsgv2ResourceId = clusterResourceGroupId + "/providers/Microsoft.Network/networkSecurityGroups/" + infraId + apisubnet.NSGSuffixV2
44+
nsgv1NodeResourceId = clusterResourceGroupId + "/providers/Microsoft.Network/networkSecurityGroups/" + infraId + subnet.NSGNodeSuffixV1
45+
nsgv1MasterResourceId = clusterResourceGroupId + "/providers/Microsoft.Network/networkSecurityGroups/" + infraId + subnet.NSGControlPlaneSuffixV1
46+
nsgv2ResourceId = clusterResourceGroupId + "/providers/Microsoft.Network/networkSecurityGroups/" + infraId + subnet.NSGSuffixV2
4847
subnetResourceIdMaster = "/subscriptions/" + subscriptionId + "/resourceGroups/" + vnetResourceGroup + "/providers/Microsoft.Network/virtualNetworks/" + vnetName + "/subnets/" + subnetNameMaster
4948
subnetResourceIdWorker = "/subscriptions/" + subscriptionId + "/resourceGroups/" + vnetResourceGroup + "/providers/Microsoft.Network/virtualNetworks/" + vnetName + "/subnets/" + subnetNameWorker
5049
subnetResourceIdWorkerInvalid = "/subscriptions/" + subscriptionId + "/resourceGroups/" + vnetResourceGroup + "/providers/Microsoft.Network/virtualNetworks/" + vnetName + "/subnets/" + subnetNameWorker + "-invalid"

‎pkg/operator/controllers/subnets/subnet_nsg.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import (
1313
armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6"
1414

1515
"github.com/Azure/ARO-RP/pkg/api"
16-
apisubnet "github.com/Azure/ARO-RP/pkg/api/util/subnet"
16+
"github.com/Azure/ARO-RP/pkg/api/util/subnet"
1717
"github.com/Azure/ARO-RP/pkg/util/azureerrors"
18-
"github.com/Azure/ARO-RP/pkg/util/subnet"
1918
)
2019

2120
const (
@@ -42,7 +41,7 @@ func (r *reconcileManager) ensureSubnetNSG(ctx context.Context, s subnet.Subnet)
4241
return fmt.Errorf("received nil, expected a value in subnetProperties when trying to Get subnet %s", s.ResourceID)
4342
}
4443

45-
correctNSGResourceID, err := apisubnet.NetworkSecurityGroupIDExpanded(architectureVersion, r.instance.Spec.ClusterResourceGroupID, r.instance.Spec.InfraID, !s.IsMaster)
44+
correctNSGResourceID, err := subnet.NetworkSecurityGroupIDExpanded(architectureVersion, r.instance.Spec.ClusterResourceGroupID, r.instance.Spec.InfraID, !s.IsMaster)
4645
if err != nil {
4746
return err
4847
}

‎pkg/operator/controllers/subnets/subnet_serviceendpoint.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
armnetwork "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6"
1212

1313
"github.com/Azure/ARO-RP/pkg/api"
14+
"github.com/Azure/ARO-RP/pkg/api/util/subnet"
1415
"github.com/Azure/ARO-RP/pkg/operator"
1516
"github.com/Azure/ARO-RP/pkg/util/azureerrors"
1617
"github.com/Azure/ARO-RP/pkg/util/pointerutils"
17-
"github.com/Azure/ARO-RP/pkg/util/subnet"
1818
)
1919

2020
func (r *reconcileManager) ensureSubnetServiceEndpoints(ctx context.Context, s subnet.Subnet) error {

‎pkg/util/azureclient/mgmt/network/generate.go‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎pkg/util/azureclient/mgmt/network/interfaces.go‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)