Repository: Azure/ARO-RP
Pull request #1164 (2020-11-13 23:17:29)

don't try to delete resources in an RG that doesn't exist


Patch:
diff --git a/.pipelines/int-release.yml b/.pipelines/int-release.yml
index 3b7b58486..48bca103f 100644
--- a/.pipelines/int-release.yml
+++ b/.pipelines/int-release.yml
@@ -5,10 +5,10 @@ trigger: none
 parameters:
 - name: vsoDeployerBuildID
   type: string
-  default: latest
+  default: master
 - name: vsoConfigBuildID
   type: string
-  default: latest
+  default: master
 - name: fullDeploy
   type: boolean
   default: false
diff --git a/.pipelines/mirror-images.yml b/.pipelines/mirror-images.yml
index ce5254767..b149f578f 100644
--- a/.pipelines/mirror-images.yml
+++ b/.pipelines/mirror-images.yml
@@ -4,7 +4,7 @@ pr: none
 parameters:
 - name: vsoDeployerBuildID
   type: string
-  default: latest
+  default: master
 
 variables:
 - template: vars.yml
@@ -22,10 +22,10 @@ jobs:
       buildType: specific
       project: $(vso-project-id)
       pipeline: $(vso-deployer-pipeline-id)
-      ${{ if eq(parameters.vsoDeployerBuildID, 'latest') }}:
+      ${{ if eq(parameters.vsoDeployerBuildID, 'master') }}:
         buildVersionToDownload: latestFromBranch
         branchName: refs/heads/master
-      ${{ if ne(parameters.vsoDeployerBuildID, 'latest') }}:
+      ${{ if ne(parameters.vsoDeployerBuildID, 'master') }}:
         buildVersionToDownload: specific
         buildId: ${{ parameters.vsoDeployerBuildID }}
       downloadType: specific
diff --git a/.pipelines/templates/template-job-deploy-azure-env.yml b/.pipelines/templates/template-job-deploy-azure-env.yml
index a4635dd5e..5e08681dd 100644
--- a/.pipelines/templates/template-job-deploy-azure-env.yml
+++ b/.pipelines/templates/template-job-deploy-azure-env.yml
@@ -32,10 +32,10 @@ jobs:
               buildType: specific
               project: ${{ parameters.vsoProjectID }}
               pipeline: ${{ parameters.vsoConfigPipelineID }}
-              ${{ if eq(parameters.vsoConfigBuildID, 'latest') }}:
+              ${{ if eq(parameters.vsoConfigBuildID, 'master') }}:
                 buildVersionToDownload: latestFromBranch
                 branchName: refs/heads/master
-              ${{ if ne(parameters.vsoConfigBuildID, 'latest') }}:
+              ${{ if ne(parameters.vsoConfigBuildID, 'master') }}:
                 buildVersionToDownload: specific
                 buildId: ${{ parameters.vsoConfigBuildID }}
               downloadType: specific
@@ -46,10 +46,10 @@ jobs:
               buildType: specific
               project: ${{ parameters.vsoProjectID }}
               pipeline: ${{ parameters.vsoDeployerPipelineID }}
-              ${{ if eq(parameters.vsoDeployerBuildID, 'latest') }}:
+              ${{ if eq(parameters.vsoDeployerBuildID, 'master') }}:
                 buildVersionToDownload: latestFromBranch
                 branchName: refs/heads/master
-              ${{ if ne(parameters.vsoDeployerBuildID, 'latest') }}:
+              ${{ if ne(parameters.vsoDeployerBuildID, 'master') }}:
                 buildVersionToDownload: specific
                 buildId: ${{ parameters.vsoDeployerBuildID }}
               downloadType: specific
diff --git a/cmd/aro/operator.go b/cmd/aro/operator.go
index 9adb24569..e0750dd71 100644
--- a/cmd/aro/operator.go
+++ b/cmd/aro/operator.go
@@ -67,7 +67,7 @@ func operator(ctx context.Context, log *logrus.Entry) error {
 	if err != nil {
 		return err
 	}
-	maocli, err := maoclient.NewForConfig(restConfig)
+	clustercli, err := maoclient.NewForConfig(restConfig)
 	if err != nil {
 		return err
 	}
@@ -111,7 +111,7 @@ func operator(ctx context.Context, log *logrus.Entry) error {
 
 	if err = (checker.NewReconciler(
 		log.WithField("controller", controllers.CheckerControllerName),
-		maocli, arocli, role, deploymentMode)).SetupWithManager(mgr); err != nil {
+		clustercli, arocli, role, deploymentMode)).SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("unable to create controller InternetChecker: %v", err)
 	}
 
diff --git a/hack/gendiscoverycache/gendiscoverycache.go b/hack/gendiscoverycache/gendiscoverycache.go
index e688687c2..40de510ad 100644
--- a/hack/gendiscoverycache/gendiscoverycache.go
+++ b/hack/gendiscoverycache/gendiscoverycache.go
@@ -37,12 +37,12 @@ func run(ctx context.Context, log *logrus.Entry) error {
 		return err
 	}
 
-	configcli, err := configclient.NewForConfig(restconfig)
+	cvClient, err := configclient.NewForConfig(restconfig)
 	if err != nil {
 		return err
 	}
 
-	clusterVersion, err := getClusterVersion(ctx, configcli)
+	clusterVersion, err := getClusterVersion(ctx, cvClient)
 	if err != nil {
 		return err
 	}
@@ -60,8 +60,8 @@ func run(ctx context.Context, log *logrus.Entry) error {
 	return writeAssets(cli, clusterVersion, discoveryCacheDir)
 }
 
-func getClusterVersion(ctx context.Context, configcli configclient.Interface) (string, error) {
-	cv, err := configcli.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
+func getClusterVersion(ctx context.Context, cvClient configclient.Interface) (string, error) {
+	cv, err := cvClient.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
 	if err != nil {
 		return "", err
 	}
diff --git a/hack/rhcos-sas/rhcos-sas.go b/hack/rhcos-sas/rhcos-sas.go
index 19f65f61a..4fa8b8f2f 100644
--- a/hack/rhcos-sas/rhcos-sas.go
+++ b/hack/rhcos-sas/rhcos-sas.go
@@ -38,12 +38,12 @@ func run(ctx context.Context) error {
 		return err
 	}
 
-	storagecli, err := azstorage.NewBasicClient(accountName, *(*keys.Keys)[0].Value)
+	storageClient, err := azstorage.NewBasicClient(accountName, *(*keys.Keys)[0].Value)
 	if err != nil {
 		return err
 	}
 
-	blobService := storagecli.GetBlobService()
+	blobService := storageClient.GetBlobService()
 
 	c := blobService.GetContainerReference("rhcos")
 
diff --git a/pkg/backend/openshiftcluster/adminupdate.go b/pkg/backend/openshiftcluster/adminupdate.go
index 3aa261af5..5cd9ea0cb 100644
--- a/pkg/backend/openshiftcluster/adminupdate.go
+++ b/pkg/backend/openshiftcluster/adminupdate.go
@@ -13,7 +13,7 @@ func (m *manager) AdminUpdate(ctx context.Context) error {
 	// m.ocDynamicValidator.Dynamic is not called so that it doesn't block an
 	// admin update
 
-	i, err := cluster.NewManager(ctx, m.log, m.env, m.db, m.cipher, m.billing, m.doc, m.subscriptionDoc)
+	i, err := cluster.New(ctx, m.log, m.env, m.db, m.cipher, m.billing, m.doc, m.subscriptionDoc)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/backend/openshiftcluster/create.go b/pkg/backend/openshiftcluster/create.go
index 07633b565..12bf3bda4 100644
--- a/pkg/backend/openshiftcluster/create.go
+++ b/pkg/backend/openshiftcluster/create.go
@@ -310,7 +310,7 @@ func (m *manager) Create(ctx context.Context) error {
 		return err
 	}
 
-	i, err := cluster.NewManager(ctx, m.log, m.env, m.db, m.cipher, m.billing, m.doc, m.subscriptionDoc)
+	i, err := cluster.New(ctx, m.log, m.env, m.db, m.cipher, m.billing, m.doc, m.subscriptionDoc)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/backend/openshiftcluster/delete.go b/pkg/backend/openshiftcluster/delete.go
index e4c84e7e8..f67a60bff 100644
--- a/pkg/backend/openshiftcluster/delete.go
+++ b/pkg/backend/openshiftcluster/delete.go
@@ -10,7 +10,7 @@ import (
 )
 
 func (m *manager) Delete(ctx context.Context) error {
-	i, err := cluster.NewManager(ctx, m.log, m.env, m.db, m.cipher, m.billing, m.doc, m.subscriptionDoc)
+	i, err := cluster.New(ctx, m.log, m.env, m.db, m.cipher, m.billing, m.doc, m.subscriptionDoc)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/backend/openshiftcluster/openshiftcluster.go b/pkg/backend/openshiftcluster/openshiftcluster.go
index d6e74c49c..eb614f416 100644
--- a/pkg/backend/openshiftcluster/openshiftcluster.go
+++ b/pkg/backend/openshiftcluster/openshiftcluster.go
@@ -44,7 +44,7 @@ type manager struct {
 
 	ocDynamicValidator validate.OpenShiftClusterDynamicValidator
 
-	resourceGroups features.ResourceGroupsClient
+	groups         features.ResourceGroupsClient
 	securityGroups network.SecurityGroupsClient
 
 	dns             dns.Manager
@@ -97,7 +97,7 @@ func NewManager(log *logrus.Entry, _env env.Interface, db database.OpenShiftClus
 
 		ocDynamicValidator: ocDynamicValidator,
 
-		resourceGroups: features.NewResourceGroupsClient(subscriptionDoc.ID, fpAuthorizer),
+		groups:         features.NewResourceGroupsClient(subscriptionDoc.ID, fpAuthorizer),
 		securityGroups: network.NewSecurityGroupsClient(subscriptionDoc.ID, fpAuthorizer),
 
 		dns:             dns.NewManager(_env, localFPAuthorizer),
diff --git a/pkg/cluster/arooperator.go b/pkg/cluster/arooperator.go
index 5c2df6e6c..d46ff2c55 100644
--- a/pkg/cluster/arooperator.go
+++ b/pkg/cluster/arooperator.go
@@ -10,7 +10,7 @@ import (
 )
 
 func (m *manager) ensureAROOperator(ctx context.Context) error {
-	dep, err := deploy.New(m.log, m.env, m.doc.OpenShiftCluster, m.kubernetescli, m.extensionscli, m.arocli)
+	dep, err := deploy.New(m.log, m.env, m.doc.OpenShiftCluster, m.kubernetescli, m.extcli, m.arocli)
 	if err != nil {
 		return err
 	}
@@ -18,7 +18,7 @@ func (m *manager) ensureAROOperator(ctx context.Context) error {
 }
 
 func (m *manager) aroDeploymentReady(ctx context.Context) (bool, error) {
-	dep, err := deploy.New(m.log, m.env, m.doc.OpenShiftCluster, m.kubernetescli, m.extensionscli, m.arocli)
+	dep, err := deploy.New(m.log, m.env, m.doc.OpenShiftCluster, m.kubernetescli, m.extcli, m.arocli)
 	if err != nil {
 		return false, err
 	}
diff --git a/pkg/cluster/blobservice.go b/pkg/cluster/blobservice.go
index bd83c79f5..026527ed0 100644
--- a/pkg/cluster/blobservice.go
+++ b/pkg/cluster/blobservice.go
@@ -19,7 +19,7 @@ func (m *manager) getBlobService(ctx context.Context, p mgmtstorage.Permissions,
 	resourceGroup := stringutils.LastTokenByte(m.doc.OpenShiftCluster.Properties.ClusterProfile.ResourceGroupID, '/')
 
 	t := time.Now().UTC().Truncate(time.Second)
-	res, err := m.storageAccounts.ListAccountSAS(ctx, resourceGroup, "cluster"+m.doc.OpenShiftCluster.Properties.StorageSuffix, mgmtstorage.AccountSasParameters{
+	res, err := m.accounts.ListAccountSAS(ctx, resourceGroup, "cluster"+m.doc.OpenShiftCluster.Properties.StorageSuffix, mgmtstorage.AccountSasParameters{
 		Services:               mgmtstorage.B,
 		ResourceTypes:          r,
 		Permissions:            p,
@@ -36,7 +36,7 @@ func (m *manager) getBlobService(ctx context.Context, p mgmtstorage.Permissions,
 		return nil, err
 	}
 
-	blobcli := azstorage.NewAccountSASClient("cluster"+m.doc.OpenShiftCluster.Properties.StorageSuffix, v, *m.env.Environment()).GetBlobService()
+	c := azstorage.NewAccountSASClient("cluster"+m.doc.OpenShiftCluster.Properties.StorageSuffix, v, *m.env.Environment()).GetBlobService()
 
-	return &blobcli, nil
+	return &c, nil
 }
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index c22705f47..825622a11 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -42,6 +42,8 @@ type Interface interface {
 	AdminUpgrade(ctx context.Context) error
 }
 
+var _ Interface = &manager{}
+
 // manager contains information needed to install and maintain an ARO cluster
 type manager struct {
 	log               *logrus.Entry
@@ -55,16 +57,16 @@ type manager struct {
 	localFpAuthorizer refreshable.Authorizer
 
 	disks               compute.DisksClient
-	virtualMachines     compute.VirtualMachinesClient
+	virtualmachines     compute.VirtualMachinesClient
 	interfaces          network.InterfacesClient
-	publicIPAddresses   network.PublicIPAddressesClient
-	loadBalancers       network.LoadBalancersClient
-	securityGroups      network.SecurityGroupsClient
+	publicipaddresses   network.PublicIPAddressesClient
+	loadbalancers       network.LoadBalancersClient
+	securitygroups      network.SecurityGroupsClient
 	deployments         features.DeploymentsClient
-	resourceGroups      features.ResourceGroupsClient
+	groups              features.ResourceGroupsClient
 	resources           features.ResourcesClient
-	virtualNetworkLinks privatedns.VirtualNetworkLinksClient
-	storageAccounts     storage.AccountsClient
+	virtualnetworklinks privatedns.VirtualNetworkLinksClient
+	accounts            storage.AccountsClient
 
 	dns             dns.Manager
 	keyvault        keyvault.Manager
@@ -72,7 +74,7 @@ type manager struct {
 	subnet          subnet.Manager
 
 	kubernetescli kubernetes.Interface
-	extensionscli extensionsclient.Interface
+	extcli        extensionsclient.Interface
 	operatorcli   operatorclient.Interface
 	configcli     configclient.Interface
 	samplescli    samplesclient.Interface
@@ -82,9 +84,9 @@ type manager struct {
 
 const deploymentName = "azuredeploy"
 
-// NewManager returns a cluster manager
-func NewManager(ctx context.Context, log *logrus.Entry, _env env.Interface, db database.OpenShiftClusters, cipher encryption.Cipher,
-	billing billing.Manager, doc *api.OpenShiftClusterDocument, subscriptionDoc *api.SubscriptionDocument) (Interface, error) {
+// New returns a cluster manager
+func New(ctx context.Context, log *logrus.Entry, _env env.Interface, db database.OpenShiftClusters, cipher encryption.Cipher,
+	billing billing.Manager, doc *api.OpenShiftClusterDocument, subscriptionDoc *api.SubscriptionDocument) (*manager, error) {
 	r, err := azure.ParseResourceID(doc.OpenShiftCluster.ID)
 	if err != nil {
 		return nil, err
@@ -117,16 +119,16 @@ func NewManager(ctx context.Context, log *logrus.Entry, _env env.Interface, db d
 		localFpAuthorizer: localFPAuthorizer,
 
 		disks:               compute.NewDisksClient(r.SubscriptionID, fpAuthorizer),
-		virtualMachines:     compute.NewVirtualMachinesClient(r.SubscriptionID, fpAuthorizer),
+		virtualmachines:     compute.NewVirtualMachinesClient(r.SubscriptionID, fpAuthorizer),
 		interfaces:          network.NewInterfacesClient(r.SubscriptionID, fpAuthorizer),
-		publicIPAddresses:   network.NewPublicIPAddressesClient(r.SubscriptionID, fpAuthorizer),
-		loadBalancers:       network.NewLoadBalancersClient(r.SubscriptionID, fpAuthorizer),
-		securityGroups:      network.NewSecurityGroupsClient(r.SubscriptionID, fpAuthorizer),
+		publicipaddresses:   network.NewPublicIPAddressesClient(r.SubscriptionID, fpAuthorizer),
+		loadbalancers:       network.NewLoadBalancersClient(r.SubscriptionID, fpAuthorizer),
+		securitygroups:      network.NewSecurityGroupsClient(r.SubscriptionID, fpAuthorizer),
 		deployments:         features.NewDeploymentsClient(r.SubscriptionID, fpAuthorizer),
-		resourceGroups:      features.NewResourceGroupsClient(r.SubscriptionID, fpAuthorizer),
+		groups:              features.NewResourceGroupsClient(r.SubscriptionID, fpAuthorizer),
 		resources:           features.NewResourcesClient(r.SubscriptionID, fpAuthorizer),
-		virtualNetworkLinks: privatedns.NewVirtualNetworkLinksClient(r.SubscriptionID, fpAuthorizer),
-		storageAccounts:     storage.NewAccountsClient(r.SubscriptionID, fpAuthorizer),
+		virtualnetworklinks: privatedns.NewVirtualNetworkLinksClient(r.SubscriptionID, fpAuthorizer),
+		accounts:            storage.NewAccountsClient(r.SubscriptionID, fpAuthorizer),
 
 		dns:             dns.NewManager(_env, localFPAuthorizer),
 		keyvault:        keyvault.NewManager(localFPKVAuthorizer, _env.ClustersKeyvaultURI()),
diff --git a/pkg/cluster/delete.go b/pkg/cluster/delete.go
index 0395d7e60..0cd44d6ec 100644
--- a/pkg/cluster/delete.go
+++ b/pkg/cluster/delete.go
@@ -29,13 +29,13 @@ func (m *manager) deletePrivateDNSVirtualNetworkLinks(ctx context.Context, resou
 		return err
 	}
 
-	virtualNetworkLinks, err := m.virtualNetworkLinks.List(ctx, r.ResourceGroup, r.ResourceName, nil)
+	virtualnetworklinks, err := m.virtualnetworklinks.List(ctx, r.ResourceGroup, r.ResourceName, nil)
 	if err != nil {
 		return err
 	}
 
-	for _, virtualNetworkLink := range virtualNetworkLinks {
-		err = m.virtualNetworkLinks.DeleteAndWait(ctx, r.ResourceGroup, r.ResourceName, *virtualNetworkLink.Name, "")
+	for _, virtualnetworklink := range virtualnetworklinks {
+		err = m.virtualnetworklinks.DeleteAndWait(ctx, r.ResourceGroup, r.ResourceName, *virtualnetworklink.Name, "")
 		if err != nil {
 			return err
 		}
@@ -50,7 +50,7 @@ func (m *manager) disconnectSecurityGroup(ctx context.Context, resourceID string
 		return err
 	}
 
-	nsg, err := m.securityGroups.Get(ctx, r.ResourceGroup, r.ResourceName, "")
+	nsg, err := m.securitygroups.Get(ctx, r.ResourceGroup, r.ResourceName, "")
 	if err != nil {
 		return err
 	}
@@ -127,6 +127,11 @@ func (m *manager) deleteResources(ctx context.Context) error {
 	resourceGroup := stringutils.LastTokenByte(m.doc.OpenShiftCluster.Properties.ClusterProfile.ResourceGroupID, '/')
 
 	resources, err := m.resources.ListByResourceGroup(ctx, resourceGroup, "", "", nil)
+	if detailedErr, ok := err.(autorest.DetailedError); ok &&
+		(detailedErr.StatusCode == http.StatusNotFound ||
+			detailedErr.StatusCode == http.StatusForbidden) {
+		return nil
+	}
 	if err != nil {
 		return err
 	}
@@ -222,7 +227,7 @@ func (m *manager) Delete(ctx context.Context) error {
 	}
 
 	m.log.Printf("deleting resource group %s", resourceGroup)
-	err = m.resourceGroups.DeleteAndWait(ctx, resourceGroup)
+	err = m.groups.DeleteAndWait(ctx, resourceGroup)
 	if detailedErr, ok := err.(autorest.DetailedError); ok &&
 		(detailedErr.StatusCode == http.StatusForbidden || detailedErr.StatusCode == http.StatusNotFound) {
 		err = nil
diff --git a/pkg/cluster/deploystorage.go b/pkg/cluster/deploystorage.go
index a6929930d..ffaf63039 100644
--- a/pkg/cluster/deploystorage.go
+++ b/pkg/cluster/deploystorage.go
@@ -118,7 +118,7 @@ func (m *manager) deployStorageTemplate(ctx context.Context, installConfig *inst
 	if m.env.DeploymentMode() == deployment.Development {
 		group.ManagedBy = nil
 	}
-	_, err := m.resourceGroups.CreateOrUpdate(ctx, resourceGroup, group)
+	_, err := m.groups.CreateOrUpdate(ctx, resourceGroup, group)
 	if requestErr, ok := err.(*azure.RequestError); ok &&
 		requestErr.ServiceError != nil && requestErr.ServiceError.Code == "RequestDisallowedByPolicy" {
 		// if request was disallowed by policy, inform user so they can take appropriate action
diff --git a/pkg/cluster/install.go b/pkg/cluster/install.go
index c2f52d2bd..29f21f5e5 100644
--- a/pkg/cluster/install.go
+++ b/pkg/cluster/install.go
@@ -147,7 +147,7 @@ func (m *manager) initializeKubernetesClients(ctx context.Context) error {
 		return err
 	}
 
-	m.extensionscli, err = extensionsclient.NewForConfig(restConfig)
+	m.extcli, err = extensionsclient.NewForConfig(restConfig)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cluster/ipaddresses.go b/pkg/cluster/ipaddresses.go
index 10f8c5f47..97f9b5d5d 100644
--- a/pkg/cluster/ipaddresses.go
+++ b/pkg/cluster/ipaddresses.go
@@ -57,13 +57,13 @@ func (m *manager) updateAPIIP(ctx context.Context) error {
 	resourceGroup := stringutils.LastTokenByte(m.doc.OpenShiftCluster.Properties.ClusterProfile.ResourceGroupID, '/')
 	var ipAddress string
 	if m.doc.OpenShiftCluster.Properties.APIServerProfile.Visibility == api.VisibilityPublic {
-		ip, err := m.publicIPAddresses.Get(ctx, resourceGroup, infraID+"-pip-v4", "")
+		ip, err := m.publicipaddresses.Get(ctx, resourceGroup, infraID+"-pip-v4", "")
 		if err != nil {
 			return err
 		}
 		ipAddress = *ip.IPAddress
 	} else {
-		lb, err := m.loadBalancers.Get(ctx, resourceGroup, infraID+"-internal", "")
+		lb, err := m.loadbalancers.Get(ctx, resourceGroup, infraID+"-internal", "")
 		if err != nil {
 			return err
 		}
diff --git a/pkg/cluster/removebootstrap.go b/pkg/cluster/removebootstrap.go
index b8cee5dce..138ac929d 100644
--- a/pkg/cluster/removebootstrap.go
+++ b/pkg/cluster/removebootstrap.go
@@ -17,7 +17,7 @@ func (m *manager) removeBootstrap(ctx context.Context) error {
 
 	resourceGroup := stringutils.LastTokenByte(m.doc.OpenShiftCluster.Properties.ClusterProfile.ResourceGroupID, '/')
 	m.log.Print("removing bootstrap vm")
-	err := m.virtualMachines.DeleteAndWait(ctx, resourceGroup, infraID+"-bootstrap")
+	err := m.virtualmachines.DeleteAndWait(ctx, resourceGroup, infraID+"-bootstrap")
 	if err != nil {
 		return err
 	}
diff --git a/pkg/cluster/start_vms.go b/pkg/cluster/start_vms.go
index 19814265f..23811f540 100644
--- a/pkg/cluster/start_vms.go
+++ b/pkg/cluster/start_vms.go
@@ -16,17 +16,17 @@ import (
 // startVMs checks cluster VMs power state and starts deallocated and stopped VMs, if any
 func (m *manager) startVMs(ctx context.Context) error {
 	resourceGroupName := stringutils.LastTokenByte(m.doc.OpenShiftCluster.Properties.ClusterProfile.ResourceGroupID, '/')
-	vms, err := m.virtualMachines.List(ctx, resourceGroupName)
+	vms, err := m.virtualmachines.List(ctx, resourceGroupName)
 	if err != nil {
 		return err
 	}
 
 	{
 		g, groupCtx := errgroup.WithContext(ctx)
-		for i, vm := range vms {
-			i, vm := i, vm // https://golang.org/doc/faq#closures_and_goroutines
+		for idx, vm := range vms {
+			idx, vm := idx, vm // https://golang.org/doc/faq#closures_and_goroutines
 			g.Go(func() (err error) {
-				vms[i], err = m.virtualMachines.Get(groupCtx, resourceGroupName, *vm.Name, mgmtcompute.InstanceView)
+				vms[idx], err = m.virtualmachines.Get(groupCtx, resourceGroupName, *vm.Name, mgmtcompute.InstanceView)
 				return
 			})
 		}
@@ -66,7 +66,7 @@ func (m *manager) startVMs(ctx context.Context) error {
 		for _, vm := range vmsToStart {
 			vm := vm // https://golang.org/doc/faq#closures_and_goroutines
 			g.Go(func() error {
-				return m.virtualMachines.StartAndWait(groupCtx, resourceGroupName, *vm.Name)
+				return m.virtualmachines.StartAndWait(groupCtx, resourceGroupName, *vm.Name)
 			})
 		}
 		return g.Wait()
diff --git a/pkg/env/dev.go b/pkg/env/dev.go
index 0c6749661..45d7c5d07 100644
--- a/pkg/env/dev.go
+++ b/pkg/env/dev.go
@@ -26,6 +26,8 @@ import (
 	"github.com/Azure/ARO-RP/pkg/util/version"
 )
 
+var _ Interface = &dev{}
+
 type dev struct {
 	*prod
 
@@ -35,7 +37,7 @@ type dev struct {
 	deployments     features.DeploymentsClient
 }
 
-func newDev(ctx context.Context, log *logrus.Entry) (Interface, error) {
+func newDev(ctx context.Context, log *logrus.Entry) (*dev, error) {
 	for _, key := range []string{
 		"AZURE_ARM_CLIENT_ID",
 		"AZURE_ARM_CLIENT_SECRET",
diff --git a/pkg/frontend/adminactions/adminactions.go b/pkg/frontend/adminactions/adminactions.go
index d1caf5098..133c82730 100644
--- a/pkg/frontend/adminactions/adminactions.go
+++ b/pkg/frontend/adminactions/adminactions.go
@@ -40,16 +40,16 @@ type adminactions struct {
 	log *logrus.Entry
 	env env.Interface
 	oc  *api.OpenShiftCluster
-	dh  dynamichelper.Interface
+	dh  dynamichelper.DynamicHelper
 
-	kubernetescli kubernetes.Interface
-	configcli     configclient.Interface
+	k8sClient    kubernetes.Interface
+	configClient configclient.Interface
 
-	resources       features.ResourcesClient
-	virtualMachines compute.VirtualMachinesClient
-	virtualNetworks network.VirtualNetworksClient
-	routeTables     network.RouteTablesClient
-	storageAccounts storage.AccountsClient
+	resourcesClient   features.ResourcesClient
+	vmClient          compute.VirtualMachinesClient
+	vNetClient        network.VirtualNetworksClient
+	routeTablesClient network.RouteTablesClient
+	accountsClient    storage.AccountsClient
 }
 
 // New returns an adminactions Interface
@@ -66,12 +66,12 @@ func New(log *logrus.Entry, env env.Interface, oc *api.OpenShiftCluster,
 		return nil, err
 	}
 
-	kubernetescli, err := kubernetes.NewForConfig(restConfig)
+	k8sClient, err := kubernetes.NewForConfig(restConfig)
 	if err != nil {
 		return nil, err
 	}
 
-	configcli, err := configclient.NewForConfig(restConfig)
+	configClient, err := configclient.NewForConfig(restConfig)
 	if err != nil {
 		return nil, err
 	}
@@ -83,19 +83,17 @@ func New(log *logrus.Entry, env env.Interface, oc *api.OpenShiftCluster,
 	}
 
 	return &adminactions{
-		log: log,
-		env: env,
-		oc:  oc,
-		dh:  dh,
-
-		kubernetescli: kubernetescli,
-		configcli:     configcli,
-
-		resources:       features.NewResourcesClient(subscriptionDoc.ID, fpAuth),
-		virtualMachines: compute.NewVirtualMachinesClient(subscriptionDoc.ID, fpAuth),
-		virtualNetworks: network.NewVirtualNetworksClient(subscriptionDoc.ID, fpAuth),
-		routeTables:     network.NewRouteTablesClient(subscriptionDoc.ID, fpAuth),
-		storageAccounts: storage.NewAccountsClient(subscriptionDoc.ID, fpAuth),
+		log:               log,
+		env:               env,
+		oc:                oc,
+		dh:                dh,
+		k8sClient:         k8sClient,
+		configClient:      configClient,
+		resourcesClient:   features.NewResourcesClient(subscriptionDoc.ID, fpAuth),
+		vmClient:          compute.NewVirtualMachinesClient(subscriptionDoc.ID, fpAuth),
+		vNetClient:        network.NewVirtualNetworksClient(subscriptionDoc.ID, fpAuth),
+		routeTablesClient: network.NewRouteTablesClient(subscriptionDoc.ID, fpAuth),
+		accountsClient:    storage.NewAccountsClient(subscriptionDoc.ID, fpAuth),
 	}, nil
 }
 
@@ -125,5 +123,5 @@ func (a *adminactions) K8sDelete(ctx context.Context, groupKind, namespace, name
 
 func (a *adminactions) VMRedeployAndWait(ctx context.Context, vmName string) error {
 	clusterRGName := stringutils.LastTokenByte(a.oc.Properties.ClusterProfile.ResourceGroupID, '/')
-	return a.virtualMachines.RedeployAndWait(ctx, clusterRGName, vmName)
+	return a.vmClient.RedeployAndWait(ctx, clusterRGName, vmName)
 }
diff --git a/pkg/frontend/adminactions/resources_list.go b/pkg/frontend/adminactions/resources_list.go
index eac6269dd..1dc165d66 100644
--- a/pkg/frontend/adminactions/resources_list.go
+++ b/pkg/frontend/adminactions/resources_list.go
@@ -20,7 +20,7 @@ import (
 func (a *adminactions) ResourcesList(ctx context.Context) ([]byte, error) {
 	clusterRGName := stringutils.LastTokenByte(a.oc.Properties.ClusterProfile.ResourceGroupID, '/')
 
-	resources, err := a.resources.ListByResourceGroup(ctx, clusterRGName, "", "", nil)
+	resources, err := a.resourcesClient.ListByResourceGroup(ctx, clusterRGName, "", "", nil)
 	if err != nil {
 		return nil, err
 	}
@@ -38,7 +38,7 @@ func (a *adminactions) ResourcesList(ctx context.Context) ([]byte, error) {
 		}
 		switch *res.Type {
 		case "Microsoft.Compute/virtualMachines":
-			vm, err := a.virtualMachines.Get(ctx, clusterRGName, *res.Name, mgmtcompute.InstanceView)
+			vm, err := a.vmClient.Get(ctx, clusterRGName, *res.Name, mgmtcompute.InstanceView)
 			if err != nil {
 				return nil, err
 			}
@@ -46,7 +46,7 @@ func (a *adminactions) ResourcesList(ctx context.Context) ([]byte, error) {
 				Resource: vm,
 			})
 		default:
-			gr, err := a.resources.GetByID(ctx, *res.ID, apiVersion)
+			gr, err := a.resourcesClient.GetByID(ctx, *res.ID, apiVersion)
 			if err != nil {
 				return nil, err
 			}
@@ -70,7 +70,7 @@ func (a *adminactions) appendAzureNetworkResources(ctx context.Context, armResou
 		return armResources, err
 	}
 
-	vnet, err := a.virtualNetworks.Get(ctx, r.ResourceGroup, r.ResourceName, "")
+	vnet, err := a.vNetClient.Get(ctx, r.ResourceGroup, r.ResourceName, "")
 	if err != nil {
 		return armResources, err
 	}
@@ -94,7 +94,7 @@ func (a *adminactions) appendAzureNetworkResources(ctx context.Context, armResou
 					a.log.Warnf("skipping route table '%s' due to ID parse error: %s", *snet.RouteTable.ID, err)
 					continue
 				}
-				rt, err := a.routeTables.Get(ctx, r.ResourceGroup, r.ResourceName, "")
+				rt, err := a.routeTablesClient.Get(ctx, r.ResourceGroup, r.ResourceName, "")
 				if err != nil {
 					a.log.Warnf("skipping route table '%s' due to Get error: %s", *snet.RouteTable.ID, err)
 					continue
diff --git a/pkg/frontend/adminactions/serialtool.go b/pkg/frontend/adminactions/serialtool.go
index 07c9601e9..110449b6b 100644
--- a/pkg/frontend/adminactions/serialtool.go
+++ b/pkg/frontend/adminactions/serialtool.go
@@ -25,7 +25,7 @@ func (a *adminactions) VMSerialConsole(ctx context.Context, w http.ResponseWrite
 	log *logrus.Entry, vmName string) error {
 
 	clusterRGName := stringutils.LastTokenByte(a.oc.Properties.ClusterProfile.ResourceGroupID, '/')
-	vm, err := a.virtualMachines.Get(ctx, clusterRGName, vmName, mgmtcompute.InstanceView)
+	vm, err := a.vmClient.Get(ctx, clusterRGName, vmName, mgmtcompute.InstanceView)
 	if err != nil {
 		return err
 	}
@@ -45,7 +45,7 @@ func (a *adminactions) VMSerialConsole(ctx context.Context, w http.ResponseWrite
 	}
 
 	t := time.Now().UTC().Truncate(time.Second)
-	res, err := a.storageAccounts.ListAccountSAS(
+	res, err := a.accountsClient.ListAccountSAS(
 		ctx, clusterRGName, "cluster"+a.oc.Properties.StorageSuffix, mgmtstorage.AccountSasParameters{
 			Services:               mgmtstorage.B,
 			ResourceTypes:          mgmtstorage.SignedResourceTypesO,
diff --git a/pkg/frontend/adminactions/upgrade.go b/pkg/frontend/adminactions/upgrade.go
index 0b374d90a..3d87a47e0 100644
--- a/pkg/frontend/adminactions/upgrade.go
+++ b/pkg/frontend/adminactions/upgrade.go
@@ -23,17 +23,17 @@ import (
 )
 
 func (a *adminactions) Upgrade(ctx context.Context, upgradeY bool) error {
-	err := preUpgradeChecks(ctx, a.oc, a.virtualNetworks)
+	err := preUpgradeChecks(ctx, a.oc, a.vNetClient)
 	if err != nil {
 		return err
 	}
 
-	return upgrade(ctx, a.log, a.configcli, version.Streams, upgradeY)
+	return upgrade(ctx, a.log, a.configClient, version.Streams, upgradeY)
 }
 
-func upgrade(ctx context.Context, log *logrus.Entry, configcli configclient.Interface, streams []*version.Stream, upgradeY bool) error {
+func upgrade(ctx context.Context, log *logrus.Entry, configClient configclient.Interface, streams []*version.Stream, upgradeY bool) error {
 	return retry.RetryOnConflict(retry.DefaultRetry, func() error {
-		cv, err := configcli.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
+		cv, err := configClient.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
 		if err != nil {
 			return err
 		}
@@ -62,13 +62,13 @@ func upgrade(ctx context.Context, log *logrus.Entry, configcli configclient.Inte
 			Image:   stream.PullSpec,
 		}
 
-		_, err = configcli.ConfigV1().ClusterVersions().Update(ctx, cv, metav1.UpdateOptions{})
+		_, err = configClient.ConfigV1().ClusterVersions().Update(ctx, cv, metav1.UpdateOptions{})
 		return err
 	})
 }
 
-func preUpgradeChecks(ctx context.Context, oc *api.OpenShiftCluster, virtualNetworks network.VirtualNetworksClient) error {
-	return checkCustomDNS(ctx, oc, virtualNetworks)
+func preUpgradeChecks(ctx context.Context, oc *api.OpenShiftCluster, vnet network.VirtualNetworksClient) error {
+	return checkCustomDNS(ctx, oc, vnet)
 }
 
 // checkCustomDNS checks if customer has custom DNS configured on VNET.
diff --git a/pkg/operator/controllers/checker/checker_controller.go b/pkg/operator/controllers/checker/checker_controller.go
index e3ecb685c..71265e0c8 100644
--- a/pkg/operator/controllers/checker/checker_controller.go
+++ b/pkg/operator/controllers/checker/checker_controller.go
@@ -29,11 +29,11 @@ type CheckerController struct {
 	checkers []Checker
 }
 
-func NewReconciler(log *logrus.Entry, maocli maoclient.Interface, arocli aroclient.AroV1alpha1Interface, role string, deploymentMode deployment.Mode) *CheckerController {
+func NewReconciler(log *logrus.Entry, clustercli maoclient.Interface, arocli aroclient.AroV1alpha1Interface, role string, deploymentMode deployment.Mode) *CheckerController {
 	checkers := []Checker{NewInternetChecker(log, arocli, role)}
 
 	if role == operator.RoleMaster {
-		checkers = append(checkers, NewMachineChecker(log, maocli, arocli, role, deploymentMode))
+		checkers = append(checkers, NewMachineChecker(log, clustercli, arocli, role, deploymentMode))
 	}
 
 	return &CheckerController{
diff --git a/pkg/operator/controllers/workaround/systemreserved.go b/pkg/operator/controllers/workaround/systemreserved.go
index bc55996e6..71288cdeb 100644
--- a/pkg/operator/controllers/workaround/systemreserved.go
+++ b/pkg/operator/controllers/workaround/systemreserved.go
@@ -22,7 +22,7 @@ import (
 
 type systemreserved struct {
 	mcocli       mcoclient.Interface
-	dh           dynamichelper.Interface
+	dh           dynamichelper.DynamicHelper
 	log          *logrus.Entry
 	versionFixed *version.Version
 }
@@ -40,7 +40,7 @@ var (
 	_ Workaround = &systemreserved{}
 )
 
-func NewSystemReserved(log *logrus.Entry, mcocli mcoclient.Interface, dh dynamichelper.Interface) *systemreserved {
+func NewSystemReserved(log *logrus.Entry, mcocli mcoclient.Interface, dh dynamichelper.DynamicHelper) *systemreserved {
 	verFixed, err := version.ParseVersion("4.99.0") // TODO set this correctly when known.
 	utilruntime.Must(err)
 
diff --git a/pkg/operator/deploy/deploy.go b/pkg/operator/deploy/deploy.go
index 8cd181a20..0c11ae6b8 100644
--- a/pkg/operator/deploy/deploy.go
+++ b/pkg/operator/deploy/deploy.go
@@ -51,13 +51,13 @@ type operator struct {
 	env env.Interface
 	oc  *api.OpenShiftCluster
 
-	dh            dynamichelper.Interface
-	cli           kubernetes.Interface
-	extensionscli extensionsclient.Interface
-	arocli        aroclient.AroV1alpha1Interface
+	dh     dynamichelper.DynamicHelper
+	cli    kubernetes.Interface
+	extcli extensionsclient.Interface
+	arocli aroclient.AroV1alpha1Interface
 }
 
-func New(log *logrus.Entry, env env.Interface, oc *api.OpenShiftCluster, cli kubernetes.Interface, extensionscli extensionsclient.Interface, arocli aroclient.AroV1alpha1Interface) (Operator, error) {
+func New(log *logrus.Entry, env env.Interface, oc *api.OpenShiftCluster, cli kubernetes.Interface, extcli extensionsclient.Interface, arocli aroclient.AroV1alpha1Interface) (Operator, error) {
 	restConfig, err := restconfig.RestConfig(env, oc)
 	if err != nil {
 		return nil, err
@@ -72,10 +72,10 @@ func New(log *logrus.Entry, env env.Interface, oc *api.OpenShiftCluster, cli kub
 		env: env,
 		oc:  oc,
 
-		dh:            dh,
-		cli:           cli,
-		extensionscli: extensionscli,
-		arocli:        arocli,
+		dh:     dh,
+		cli:    cli,
+		extcli: extcli,
+		arocli: arocli,
 	}, nil
 }
 
@@ -208,7 +208,7 @@ func (o *operator) CreateOrUpdate(ctx context.Context) error {
 		switch un.GroupVersionKind().GroupKind().String() {
 		case "CustomResourceDefinition.apiextensions.k8s.io":
 			err = wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
-				crd, err := o.extensionscli.ApiextensionsV1beta1().CustomResourceDefinitions().Get(ctx, un.GetName(), metav1.GetOptions{})
+				crd, err := o.extcli.ApiextensionsV1beta1().CustomResourceDefinitions().Get(ctx, un.GetName(), metav1.GetOptions{})
 				if err != nil {
 					return false, err
 				}
diff --git a/pkg/util/arm/marshal.go b/pkg/util/arm/marshal.go
index ffe062177..dc57403c1 100644
--- a/pkg/util/arm/marshal.go
+++ b/pkg/util/arm/marshal.go
@@ -40,11 +40,11 @@ func (r *Resource) MarshalJSON() ([]byte, error) {
 	for i := 1; i < outer.NumField(); i++ {
 		field := outer.Type().Field(i)
 
-		if j, found := indexes[field.Name]; found {
+		if idx, found := indexes[field.Name]; found {
 			field.Type = emptyInterfaceType
-			fields[j] = field
+			fields[idx] = field
 			if !outer.Field(i).IsZero() {
-				values[j] = outer.Field(i)
+				values[idx] = outer.Field(i)
 			}
 		} else {
 			fields = append(fields, field)
diff --git a/pkg/util/clusterdata/worker_profiles_task.go b/pkg/util/clusterdata/worker_profiles_task.go
index 411bb91f5..74eb4af1e 100644
--- a/pkg/util/clusterdata/worker_profiles_task.go
+++ b/pkg/util/clusterdata/worker_profiles_task.go
@@ -24,21 +24,21 @@ const (
 )
 
 func newWorkerProfilesEnricherTask(log *logrus.Entry, restConfig *rest.Config, oc *api.OpenShiftCluster) (enricherTask, error) {
-	maocli, err := maoclient.NewForConfig(restConfig)
+	client, err := maoclient.NewForConfig(restConfig)
 	if err != nil {
 		return nil, err
 	}
 
 	return &workerProfilesEnricherTask{
 		log:    log,
-		maocli: maocli,
+		client: client,
 		oc:     oc,
 	}, nil
 }
 
 type workerProfilesEnricherTask struct {
 	log    *logrus.Entry
-	maocli maoclient.Interface
+	client maoclient.Interface
 	oc     *api.OpenShiftCluster
 }
 
@@ -50,7 +50,7 @@ func (ef *workerProfilesEnricherTask) FetchData(ctx context.Context, callbacks c
 		return
 	}
 
-	machinesets, err := ef.maocli.MachineV1beta1().MachineSets(workerMachineSetsNamespace).List(ctx, metav1.ListOptions{})
+	machinesets, err := ef.client.MachineV1beta1().MachineSets(workerMachineSetsNamespace).List(ctx, metav1.ListOptions{})
 	if err != nil {
 		ef.log.Error(err)
 		errs <- err
diff --git a/pkg/util/dynamichelper/dynamichelper.go b/pkg/util/dynamichelper/dynamichelper.go
index 0f659e1de..54a35e99f 100644
--- a/pkg/util/dynamichelper/dynamichelper.go
+++ b/pkg/util/dynamichelper/dynamichelper.go
@@ -25,7 +25,7 @@ import (
 	kadiscovery "github.com/Azure/ARO-RP/pkg/util/dynamichelper/discovery"
 )
 
-type Interface interface {
+type DynamicHelper interface {
 	RefreshAPIResources() error
 	CreateOrUpdate(ctx context.Context, obj *unstructured.Unstructured) error
 	Delete(ctx context.Context, groupKind, namespace, name string) error
@@ -42,7 +42,7 @@ type dynamicHelper struct {
 	apiresources []*metav1.APIResourceList
 }
 
-func New(log *logrus.Entry, restconfig *rest.Config) (Interface, error) {
+func New(log *logrus.Entry, restconfig *rest.Config) (DynamicHelper, error) {
 	dh := &dynamicHelper{
 		log:        log,
 		restconfig: restconfig,
diff --git a/pkg/util/dynamichelper/generate.go b/pkg/util/dynamichelper/generate.go
index bab62d1ec..91613d51f 100644
--- a/pkg/util/dynamichelper/generate.go
+++ b/pkg/util/dynamichelper/generate.go
@@ -4,5 +4,5 @@ package dynamichelper
 // Licensed under the Apache License 2.0.
 
 //go:generate rm -rf ../mocks/$GOPACKAGE
-//go:generate go run ../../../vendor/github.com/golang/mock/mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE Interface
+//go:generate go run ../../../vendor/github.com/golang/mock/mockgen -destination=../mocks/$GOPACKAGE/$GOPACKAGE.go github.com/Azure/ARO-RP/pkg/util/$GOPACKAGE DynamicHelper
 //go:generate go run ../../../vendor/golang.org/x/tools/cmd/goimports -local=github.com/Azure/ARO-RP -e -w ../mocks/$GOPACKAGE/$GOPACKAGE.go
diff --git a/pkg/util/mocks/dynamichelper/dynamichelper.go b/pkg/util/mocks/dynamichelper/dynamichelper.go
index e1b647aa9..d62113e01 100644
--- a/pkg/util/mocks/dynamichelper/dynamichelper.go
+++ b/pkg/util/mocks/dynamichelper/dynamichelper.go
@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/Azure/ARO-RP/pkg/util/dynamichelper (interfaces: Interface)
+// Source: github.com/Azure/ARO-RP/pkg/util/dynamichelper (interfaces: DynamicHelper)
 
 // Package mock_dynamichelper is a generated GoMock package.
 package mock_dynamichelper
@@ -12,31 +12,31 @@ import (
 	unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
-// MockInterface is a mock of Interface interface
-type MockInterface struct {
+// MockDynamicHelper is a mock of DynamicHelper interface
+type MockDynamicHelper struct {
 	ctrl     *gomock.Controller
-	recorder *MockInterfaceMockRecorder
+	recorder *MockDynamicHelperMockRecorder
 }
 
-// MockInterfaceMockRecorder is the mock recorder for MockInterface
-type MockInterfaceMockRecorder struct {
-	mock *MockInterface
+// MockDynamicHelperMockRecorder is the mock recorder for MockDynamicHelper
+type MockDynamicHelperMockRecorder struct {
+	mock *MockDynamicHelper
 }
 
-// NewMockInterface creates a new mock instance
-func NewMockInterface(ctrl *gomock.Controller) *MockInterface {
-	mock := &MockInterface{ctrl: ctrl}
-	mock.recorder = &MockInterfaceMockRecorder{mock}
+// NewMockDynamicHelper creates a new mock instance
+func NewMockDynamicHelper(ctrl *gomock.Controller) *MockDynamicHelper {
+	mock := &MockDynamicHelper{ctrl: ctrl}
+	mock.recorder = &MockDynamicHelperMockRecorder{mock}
 	return mock
 }
 
 // EXPECT returns an object that allows the caller to indicate expected use
-func (m *MockInterface) EXPECT() *MockInterfaceMockRecorder {
+func (m *MockDynamicHelper) EXPECT() *MockDynamicHelperMockRecorder {
 	return m.recorder
 }
 
 // CreateOrUpdate mocks base method
-func (m *MockInterface) CreateOrUpdate(arg0 context.Context, arg1 *unstructured.Unstructured) error {
+func (m *MockDynamicHelper) CreateOrUpdate(arg0 context.Context, arg1 *unstructured.Unstructured) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "CreateOrUpdate", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -44,13 +44,13 @@ func (m *MockInterface) CreateOrUpdate(arg0 context.Context, arg1 *unstructured.
 }
 
 // CreateOrUpdate indicates an expected call of CreateOrUpdate
-func (mr *MockInterfaceMockRecorder) CreateOrUpdate(arg0, arg1 interface{}) *gomock.Call {
+func (mr *MockDynamicHelperMockRecorder) CreateOrUpdate(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOrUpdate", reflect.TypeOf((*MockInterface)(nil).CreateOrUpdate), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOrUpdate", reflect.TypeOf((*MockDynamicHelper)(nil).CreateOrUpdate), arg0, arg1)
 }
 
 // Delete mocks base method
-func (m *MockInterface) Delete(arg0 context.Context, arg1, arg2, arg3 string) error {
+func (m *MockDynamicHelper) Delete(arg0 context.Context, arg1, arg2, arg3 string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Delete", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(error)
@@ -58,13 +58,13 @@ func (m *MockInterface) Delete(arg0 context.Context, arg1, arg2, arg3 string) er
 }
 
 // Delete indicates an expected call of Delete
-func (mr *MockInterfaceMockRecorder) Delete(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+func (mr *MockDynamicHelperMockRecorder) Delete(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockInterface)(nil).Delete), arg0, arg1, arg2, arg3)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockDynamicHelper)(nil).Delete), arg0, arg1, arg2, arg3)
 }
 
 // Ensure mocks base method
-func (m *MockInterface) Ensure(arg0 context.Context, arg1 *unstructured.Unstructured) error {
+func (m *MockDynamicHelper) Ensure(arg0 context.Context, arg1 *unstructured.Unstructured) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Ensure", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -72,13 +72,13 @@ func (m *MockInterface) Ensure(arg0 context.Context, arg1 *unstructured.Unstruct
 }
 
 // Ensure indicates an expected call of Ensure
-func (mr *MockInterfaceMockRecorder) Ensure(arg0, arg1 interface{}) *gomock.Call {
+func (mr *MockDynamicHelperMockRecorder) Ensure(arg0, arg1 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ensure", reflect.TypeOf((*MockInterface)(nil).Ensure), arg0, arg1)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Ensure", reflect.TypeOf((*MockDynamicHelper)(nil).Ensure), arg0, arg1)
 }
 
 // Get mocks base method
-func (m *MockInterface) Get(arg0 context.Context, arg1, arg2, arg3 string) (*unstructured.Unstructured, error) {
+func (m *MockDynamicHelper) Get(arg0 context.Context, arg1, arg2, arg3 string) (*unstructured.Unstructured, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Get", arg0, arg1, arg2, arg3)
 	ret0, _ := ret[0].(*unstructured.Unstructured)
@@ -87,13 +87,13 @@ func (m *MockInterface) Get(arg0 context.Context, arg1, arg2, arg3 string) (*uns
 }
 
 // Get indicates an expected call of Get
-func (mr *MockInterfaceMockRecorder) Get(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
+func (mr *MockDynamicHelperMockRecorder) Get(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockInterface)(nil).Get), arg0, arg1, arg2, arg3)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockDynamicHelper)(nil).Get), arg0, arg1, arg2, arg3)
 }
 
 // List mocks base method
-func (m *MockInterface) List(arg0 context.Context, arg1, arg2 string) (*unstructured.UnstructuredList, error) {
+func (m *MockDynamicHelper) List(arg0 context.Context, arg1, arg2 string) (*unstructured.UnstructuredList, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "List", arg0, arg1, arg2)
 	ret0, _ := ret[0].(*unstructured.UnstructuredList)
@@ -102,13 +102,13 @@ func (m *MockInterface) List(arg0 context.Context, arg1, arg2 string) (*unstruct
 }
 
 // List indicates an expected call of List
-func (mr *MockInterfaceMockRecorder) List(arg0, arg1, arg2 interface{}) *gomock.Call {
+func (mr *MockDynamicHelperMockRecorder) List(arg0, arg1, arg2 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockInterface)(nil).List), arg0, arg1, arg2)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockDynamicHelper)(nil).List), arg0, arg1, arg2)
 }
 
 // RefreshAPIResources mocks base method
-func (m *MockInterface) RefreshAPIResources() error {
+func (m *MockDynamicHelper) RefreshAPIResources() error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "RefreshAPIResources")
 	ret0, _ := ret[0].(error)
@@ -116,7 +116,7 @@ func (m *MockInterface) RefreshAPIResources() error {
 }
 
 // RefreshAPIResources indicates an expected call of RefreshAPIResources
-func (mr *MockInterfaceMockRecorder) RefreshAPIResources() *gomock.Call {
+func (mr *MockDynamicHelperMockRecorder) RefreshAPIResources() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RefreshAPIResources", reflect.TypeOf((*MockInterface)(nil).RefreshAPIResources))
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RefreshAPIResources", reflect.TypeOf((*MockDynamicHelper)(nil).RefreshAPIResources))
 }
diff --git a/pkg/util/purge/purge.go b/pkg/util/purge/purge.go
index ebf362979..14698431f 100644
--- a/pkg/util/purge/purge.go
+++ b/pkg/util/purge/purge.go
@@ -27,7 +27,7 @@ type ResourceCleaner struct {
 	privatelinkservicescli network.PrivateLinkServicesClient
 	securitygroupscli      network.SecurityGroupsClient
 
-	subnet subnet.Manager
+	subnetManager subnet.Manager
 
 	shouldDelete checkFn
 }
@@ -48,7 +48,7 @@ func NewResourceCleaner(log *logrus.Entry, subscriptionID string, shouldDelete c
 		privatelinkservicescli: network.NewPrivateLinkServicesClient(subscriptionID, authorizer),
 		securitygroupscli:      network.NewSecurityGroupsClient(subscriptionID, authorizer),
 
-		subnet: subnet.NewManager(subscriptionID, authorizer),
+		subnetManager: subnet.NewManager(subscriptionID, authorizer),
 
 		// ShouldDelete decides whether the resource group gets deleted
 		shouldDelete: shouldDelete,
diff --git a/pkg/util/purge/resourcegroups.go b/pkg/util/purge/resourcegroups.go
index 0eb3b0d4c..7f0bdd60f 100644
--- a/pkg/util/purge/resourcegroups.go
+++ b/pkg/util/purge/resourcegroups.go
@@ -73,7 +73,7 @@ func (rc *ResourceCleaner) cleanNetworking(ctx context.Context, resourceGroup mg
 		}
 
 		for _, secGroupSubnet := range *secGroup.SecurityGroupPropertiesFormat.Subnets {
-			subnet, err := rc.subnet.Get(ctx, *secGroupSubnet.ID)
+			subnet, err := rc.subnetManager.Get(ctx, *secGroupSubnet.ID)
 			if err != nil {
 				return err
 			}
@@ -87,7 +87,7 @@ func (rc *ResourceCleaner) cleanNetworking(ctx context.Context, resourceGroup mg
 
 				subnet.NetworkSecurityGroup = nil
 
-				err = rc.subnet.CreateOrUpdate(ctx, *subnet.ID, subnet)
+				err = rc.subnetManager.CreateOrUpdate(ctx, *subnet.ID, subnet)
 				if err != nil {
 					return err
 				}


Test patch:
diff --git a/pkg/cluster/start_vms_test.go b/pkg/cluster/start_vms_test.go
index f720089c9..8356e8a1a 100644
--- a/pkg/cluster/start_vms_test.go
+++ b/pkg/cluster/start_vms_test.go
@@ -208,7 +208,7 @@ func TestStartVMs(t *testing.T) {
 			tt.mock(vmClient)
 
 			m := &manager{
-				virtualMachines: vmClient,
+				virtualmachines: vmClient,
 				doc: &api.OpenShiftClusterDocument{
 					OpenShiftCluster: &api.OpenShiftCluster{
 						Properties: api.OpenShiftClusterProperties{
diff --git a/pkg/frontend/adminactions/resources_list_test.go b/pkg/frontend/adminactions/resources_list_test.go
index 38f60c3a4..fed90041c 100644
--- a/pkg/frontend/adminactions/resources_list_test.go
+++ b/pkg/frontend/adminactions/resources_list_test.go
@@ -42,9 +42,9 @@ func TestResourcesList(t *testing.T) {
 		{
 			name:       "basic coverage",
 			resourceID: fmt.Sprintf("/subscriptions/%s/resourcegroups/resourceGroup/providers/Microsoft.RedHatOpenShift/openShiftClusters/resourceName", mockSubID),
-			mocks: func(tt *test, resources *mock_features.MockResourcesClient, virtualMachines *mock_compute.MockVirtualMachinesClient, virtualNetworks *mock_network.MockVirtualNetworksClient, routeTables *mock_network.MockRouteTablesClient) {
+			mocks: func(tt *test, resourcesClient *mock_features.MockResourcesClient, vmClient *mock_compute.MockVirtualMachinesClient, vNetClient *mock_network.MockVirtualNetworksClient, routeTablesClient *mock_network.MockRouteTablesClient) {
 
-				resources.EXPECT().ListByResourceGroup(gomock.Any(), "test-cluster", "", "", nil).Return([]mgmtfeatures.GenericResourceExpanded{
+				resourcesClient.EXPECT().ListByResourceGroup(gomock.Any(), "test-cluster", "", "", nil).Return([]mgmtfeatures.GenericResourceExpanded{
 					{
 						Name: to.StringPtr("vm-1"),
 						ID:   to.StringPtr("/subscriptions/id"),
@@ -57,7 +57,7 @@ func TestResourcesList(t *testing.T) {
 					},
 				}, nil)
 
-				virtualNetworks.EXPECT().Get(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(mgmtnetwork.VirtualNetwork{
+				vNetClient.EXPECT().Get(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(mgmtnetwork.VirtualNetwork{
 					ID:   to.StringPtr("/subscriptions/id"),
 					Type: to.StringPtr("Microsoft.Network/virtualNetworks"),
 					VirtualNetworkPropertiesFormat: &mgmtnetwork.VirtualNetworkPropertiesFormat{
@@ -77,19 +77,19 @@ func TestResourcesList(t *testing.T) {
 					},
 				}, nil)
 
-				routeTables.EXPECT().Get(gomock.Any(), "mockrg", "routetable1", "").Return(mgmtnetwork.RouteTable{
+				routeTablesClient.EXPECT().Get(gomock.Any(), "mockrg", "routetable1", "").Return(mgmtnetwork.RouteTable{
 					ID:   to.StringPtr("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mockrg/providers/Microsoft.Network/routeTables/routetable1"),
 					Name: to.StringPtr("routetable1"),
 				}, nil)
 
-				resources.EXPECT().GetByID(gomock.Any(), "/subscriptions/id", azureclient.APIVersion("Microsoft.Storage")).Return(mgmtfeatures.GenericResource{
+				resourcesClient.EXPECT().GetByID(gomock.Any(), "/subscriptions/id", azureclient.APIVersion("Microsoft.Storage")).Return(mgmtfeatures.GenericResource{
 					Name:     to.StringPtr("storage"),
 					ID:       to.StringPtr("/subscriptions/id"),
 					Type:     to.StringPtr("Microsoft.Storage/storageAccounts"),
 					Location: to.StringPtr("eastus"),
 				}, nil)
 
-				virtualMachines.EXPECT().Get(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(mgmtcompute.VirtualMachine{
+				vmClient.EXPECT().Get(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(mgmtcompute.VirtualMachine{
 					ID:   to.StringPtr("/subscriptions/id"),
 					Type: to.StringPtr("Microsoft.Compute/virtualMachines"),
 					VirtualMachineProperties: &mgmtcompute.VirtualMachineProperties{
@@ -101,10 +101,10 @@ func TestResourcesList(t *testing.T) {
 			wantResponse:   []byte(`[{"properties":{"dhcpOptions":{"dnsServers":[]},"subnets":[{"properties":{"routeTable":{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mockrg/providers/Microsoft.Network/routeTables/routetable1","tags":null}},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test-cluster/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/master"}]},"id":"/subscriptions/id","type":"Microsoft.Network/virtualNetworks"},{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mockrg/providers/Microsoft.Network/routeTables/routetable1","name":"routetable1"},{"properties":{"provisioningState":"Succeeded"},"id":"/subscriptions/id","type":"Microsoft.Compute/virtualMachines"},{"id":"/subscriptions/id","name":"storage","type":"Microsoft.Storage/storageAccounts","location":"eastus"}]`),
 		},
 		{
-			name:       "vnet get error", //Get resources should continue on error from virtualNetworks.Get()
+			name:       "vnet get error", //Get resources should continue on error from vNetClient.Get()
 			resourceID: fmt.Sprintf("/subscriptions/%s/resourcegroups/resourceGroup/providers/Microsoft.RedHatOpenShift/openShiftClusters/resourceName", mockSubID),
-			mocks: func(tt *test, resources *mock_features.MockResourcesClient, virtualMachines *mock_compute.MockVirtualMachinesClient, virtualNetworks *mock_network.MockVirtualNetworksClient, routeTablesClient *mock_network.MockRouteTablesClient) {
-				resources.EXPECT().ListByResourceGroup(gomock.Any(), "test-cluster", "", "", nil).Return([]mgmtfeatures.GenericResourceExpanded{
+			mocks: func(tt *test, resourcesClient *mock_features.MockResourcesClient, vmClient *mock_compute.MockVirtualMachinesClient, vNetClient *mock_network.MockVirtualNetworksClient, routeTablesClient *mock_network.MockRouteTablesClient) {
+				resourcesClient.EXPECT().ListByResourceGroup(gomock.Any(), "test-cluster", "", "", nil).Return([]mgmtfeatures.GenericResourceExpanded{
 					{
 						Name: to.StringPtr("vm-1"),
 						ID:   to.StringPtr("/subscriptions/id"),
@@ -117,16 +117,16 @@ func TestResourcesList(t *testing.T) {
 					},
 				}, nil)
 
-				virtualNetworks.EXPECT().Get(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(mgmtnetwork.VirtualNetwork{}, fmt.Errorf("Any error during Get, expecting a permissions error"))
+				vNetClient.EXPECT().Get(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(mgmtnetwork.VirtualNetwork{}, fmt.Errorf("Any error during Get, expecting a permissions error"))
 
-				resources.EXPECT().GetByID(gomock.Any(), "/subscriptions/id", azureclient.APIVersion("Microsoft.Storage")).Return(mgmtfeatures.GenericResource{
+				resourcesClient.EXPECT().GetByID(gomock.Any(), "/subscriptions/id", azureclient.APIVersion("Microsoft.Storage")).Return(mgmtfeatures.GenericResource{
 					Name:     to.StringPtr("storage"),
 					ID:       to.StringPtr("/subscriptions/id"),
 					Type:     to.StringPtr("Microsoft.Storage/storageAccounts"),
 					Location: to.StringPtr("eastus"),
 				}, nil)
 
-				virtualMachines.EXPECT().Get(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(mgmtcompute.VirtualMachine{
+				vmClient.EXPECT().Get(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(mgmtcompute.VirtualMachine{
 					ID:   to.StringPtr("/subscriptions/id"),
 					Type: to.StringPtr("Microsoft.Compute/virtualMachines"),
 					VirtualMachineProperties: &mgmtcompute.VirtualMachineProperties{
@@ -145,11 +145,11 @@ func TestResourcesList(t *testing.T) {
 			env := mock_env.NewMockInterface(controller)
 			env.EXPECT().Location().AnyTimes().Return("eastus")
 
-			resources := mock_features.NewMockResourcesClient(controller)
-			virtualMachines := mock_compute.NewMockVirtualMachinesClient(controller)
-			virtualNetworks := mock_network.NewMockVirtualNetworksClient(controller)
-			routeTables := mock_network.NewMockRouteTablesClient(controller)
-			tt.mocks(tt, resources, virtualMachines, virtualNetworks, routeTables)
+			resourcesClient := mock_features.NewMockResourcesClient(controller)
+			vmClient := mock_compute.NewMockVirtualMachinesClient(controller)
+			vNetClient := mock_network.NewMockVirtualNetworksClient(controller)
+			routeTablesClient := mock_network.NewMockRouteTablesClient(controller)
+			tt.mocks(tt, resourcesClient, vmClient, vNetClient, routeTablesClient)
 
 			a := adminactions{
 				log: logrus.NewEntry(logrus.StandardLogger()),
@@ -165,10 +165,10 @@ func TestResourcesList(t *testing.T) {
 					},
 				},
 
-				resources:       resources,
-				virtualMachines: virtualMachines,
-				virtualNetworks: virtualNetworks,
-				routeTables:     routeTables,
+				resourcesClient:   resourcesClient,
+				vmClient:          vmClient,
+				vNetClient:        vNetClient,
+				routeTablesClient: routeTablesClient,
 			}
 
 			b, err := a.ResourcesList(ctx)
diff --git a/pkg/frontend/adminactions/upgrade_test.go b/pkg/frontend/adminactions/upgrade_test.go
index 1ab153108..5bcbb359c 100644
--- a/pkg/frontend/adminactions/upgrade_test.go
+++ b/pkg/frontend/adminactions/upgrade_test.go
@@ -174,11 +174,11 @@ func TestUpgradeCluster(t *testing.T) {
 			})
 
 			a := &adminactions{
-				log:       logrus.NewEntry(logrus.StandardLogger()),
-				configcli: tt.fakecli,
+				log:          logrus.NewEntry(logrus.StandardLogger()),
+				configClient: tt.fakecli,
 			}
 
-			err := upgrade(ctx, a.log, a.configcli, []*version.Stream{stream43, stream44, stream45}, tt.upgradeY)
+			err := upgrade(ctx, a.log, a.configClient, []*version.Stream{stream43, stream44, stream45}, tt.upgradeY)
 			if err != nil && err.Error() != tt.wantErr ||
 				err == nil && tt.wantErr != "" {
 				t.Error(err)
@@ -188,7 +188,7 @@ func TestUpgradeCluster(t *testing.T) {
 				t.Fatal(updated)
 			}
 
-			cv, err := a.configcli.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
+			cv, err := a.configClient.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
 			if err != nil {
 				t.Error(err)
 			}
@@ -247,14 +247,14 @@ func TestCheckCustomDNS(t *testing.T) {
 			controller := gomock.NewController(t)
 			defer controller.Finish()
 
-			virtualNetworks := mock_network.NewMockVirtualNetworksClient(controller)
+			vnetClient := mock_network.NewMockVirtualNetworksClient(controller)
 			if tt.mocks != nil {
-				tt.mocks(virtualNetworks)
+				tt.mocks(vnetClient)
 			}
 
 			a := &adminactions{
-				log:             logrus.NewEntry(logrus.StandardLogger()),
-				virtualNetworks: virtualNetworks,
+				log:        logrus.NewEntry(logrus.StandardLogger()),
+				vNetClient: vnetClient,
 			}
 
 			oc := &api.OpenShiftCluster{
@@ -265,7 +265,7 @@ func TestCheckCustomDNS(t *testing.T) {
 				},
 			}
 
-			err := checkCustomDNS(ctx, oc, a.virtualNetworks)
+			err := checkCustomDNS(ctx, oc, a.vNetClient)
 			if err != nil && err.Error() != tt.wantErr ||
 				err == nil && tt.wantErr != "" {
 				t.Error(err)
diff --git a/pkg/operator/controllers/workaround/systemreserved_test.go b/pkg/operator/controllers/workaround/systemreserved_test.go
index aba565b0e..c6f876a57 100644
--- a/pkg/operator/controllers/workaround/systemreserved_test.go
+++ b/pkg/operator/controllers/workaround/systemreserved_test.go
@@ -56,7 +56,7 @@ func TestSystemreservedEnsure(t *testing.T) {
 	tests := []struct {
 		name                         string
 		mcocli                       *fakemcoclient.Clientset
-		mocker                       func(mdh *mock_dynamichelper.MockInterface)
+		mocker                       func(mdh *mock_dynamichelper.MockDynamicHelper)
 		machineConfigPoolNeedsUpdate bool
 		wantErr                      bool
 	}{
@@ -68,7 +68,7 @@ func TestSystemreservedEnsure(t *testing.T) {
 				},
 			}),
 			machineConfigPoolNeedsUpdate: true,
-			mocker: func(mdh *mock_dynamichelper.MockInterface) {
+			mocker: func(mdh *mock_dynamichelper.MockDynamicHelper) {
 				mdh.EXPECT().Ensure(gomock.Any(), gomock.Any()).Return(nil)
 			},
 		},
@@ -80,7 +80,7 @@ func TestSystemreservedEnsure(t *testing.T) {
 					Labels: map[string]string{labelName: labelValue},
 				},
 			}),
-			mocker: func(mdh *mock_dynamichelper.MockInterface) {
+			mocker: func(mdh *mock_dynamichelper.MockDynamicHelper) {
 				mdh.EXPECT().Ensure(gomock.Any(), gomock.Any()).Return(nil)
 			},
 		},
@@ -94,7 +94,7 @@ func TestSystemreservedEnsure(t *testing.T) {
 			controller := gomock.NewController(t)
 			defer controller.Finish()
 
-			mdh := mock_dynamichelper.NewMockInterface(controller)
+			mdh := mock_dynamichelper.NewMockDynamicHelper(controller)
 			sr := &systemreserved{
 				mcocli: tt.mcocli,
 				dh:     mdh,
diff --git a/pkg/util/clusterdata/worker_profiles_task_test.go b/pkg/util/clusterdata/worker_profiles_task_test.go
index d7692e9a4..e9933c609 100644
--- a/pkg/util/clusterdata/worker_profiles_task_test.go
+++ b/pkg/util/clusterdata/worker_profiles_task_test.go
@@ -261,7 +261,7 @@ func TestWorkerProfilesEnricherTask(t *testing.T) {
 
 			e := &workerProfilesEnricherTask{
 				log:    log,
-				maocli: tt.client(),
+				client: tt.client(),
 				oc:     oc,
 			}
 			e.SetDefaults()
diff --git a/test/e2e/setup.go b/test/e2e/setup.go
index 1d3024d81..da1e9b6b0 100644
--- a/test/e2e/setup.go
+++ b/test/e2e/setup.go
@@ -185,7 +185,7 @@ func done(ctx context.Context) error {
 var _ = BeforeSuite(func() {
 	log.Info("BeforeSuite")
 
-	SetDefaultEventuallyTimeout(2 * time.Minute)
+	SetDefaultEventuallyTimeout(5 * time.Minute)
 	SetDefaultEventuallyPollingInterval(10 * time.Second)
 
 	if err := setup(context.Background()); err != nil {