Skip to content

Commit

Permalink
Renaming Azure.Service -> Azure.Reconciler and modifying the cloud pa…
Browse files Browse the repository at this point in the history 
…ckage to azure
  • Loading branch information
@surajrana93
surajrana93 authored and Cecile Robert-Michon committed Feb 3, 2021
1 parent 8df2692 commit aca8761
Show file tree
Hide file tree
Showing 180 changed files with 271 additions and 271 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Allow only these
!/api/**
!/cloud/**
!/azure/**
!/controllers/**
!/exp/**
!/feature/**
Expand Down
0 cloud/converters/dns.go → azure/converters/dns.go
View file
File renamed without changes.
0 cloud/converters/dns_test.go → azure/converters/dns_test.go
View file
File renamed without changes.
0 cloud/converters/identity.go → azure/converters/identity.go
View file
File renamed without changes.
0 cloud/converters/identity_test.go → azure/converters/identity_test.go
View file
File renamed without changes.
0 cloud/converters/image.go → azure/converters/image.go
View file
File renamed without changes.
0 cloud/converters/loadbalancers.go → azure/converters/loadbalancers.go
View file
File renamed without changes.
0 cloud/converters/rules.go → azure/converters/rules.go
View file
File renamed without changes.
0 cloud/converters/spotinstances.go → azure/converters/spotinstances.go
View file
File renamed without changes.
0 cloud/converters/tags.go → azure/converters/tags.go
View file
File renamed without changes.
0 cloud/converters/vm.go → azure/converters/vm.go
View file
File renamed without changes.
0 cloud/converters/vmss.go → azure/converters/vmss.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cloud/converters/vmss_test.go → azure/converters/vmss_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/onsi/gomega"

"sigs.k8s.io/cluster-api-provider-azure/cloud/converters"
"sigs.k8s.io/cluster-api-provider-azure/azure/converters"
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3"
)

Expand Down
0 cloud/defaults.go → azure/defaults.go
View file
File renamed without changes.
0 cloud/defaults_test.go → azure/defaults_test.go
View file
File renamed without changes.
0 cloud/errors.go → azure/errors.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions cloud/interfaces.go → azure/interfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
)

// Service is a generic interface used by components offering a type of service.
// Reconciler is a generic interface used by components offering a type of service.
// Example: virtualnetworks service would offer Reconcile/Delete methods.
type Service interface {
type Reconciler interface {
Reconcile(ctx context.Context) error
Delete(ctx context.Context) error
}
Expand All @@ -42,7 +42,7 @@ type OldService interface {
// CredentialGetter is a Service which knows how to retrieve credentials for an Azure
// resource in a resource group.
type CredentialGetter interface {
Service
Reconciler
GetCredentials(ctx context.Context, group string, cluster string) ([]byte, error)
}

Expand Down
0 cloud/mocks/doc.go → azure/mocks/doc.go
View file
File renamed without changes.
34 changes: 17 additions & 17 deletions cloud/mocks/service_mock.go → azure/mocks/service_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 cloud/scope/clients.go → azure/scope/clients.go
View file
File renamed without changes.
0 cloud/scope/clients_test.go → azure/scope/clients_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cloud/scope/cluster.go → azure/scope/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
)

// ClusterScopeParams defines the input parameters used to create a new Scope.
Expand Down
0 cloud/scope/identity.go → azure/scope/identity.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cloud/scope/machine.go → azure/scope/machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
)

// MachineScopeParams defines the input parameters used to create a new MachineScope.
Expand Down
2 changes: 1 addition & 1 deletion cloud/scope/machine_test.go → azure/scope/machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
)

Expand Down
2 changes: 1 addition & 1 deletion cloud/scope/machinepool.go → azure/scope/machinepool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)
Expand Down
0 cloud/scope/machinepool_test.go → azure/scope/machinepool_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cloud/scope/managedcontrolplane.go → azure/scope/managedcontrolplane.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha3"
)

Expand Down
2 changes: 1 addition & 1 deletion cloud/services/agentpools/agentpools.go → azure/services/agentpools/agentpools.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pkg/errors"
"k8s.io/klog"

azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
2 changes: 1 addition & 1 deletion cloud/services/agentpools/agentpools_test.go → azure/services/agentpools/agentpools_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"

"sigs.k8s.io/cluster-api-provider-azure/cloud/services/agentpools/mock_agentpools"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/agentpools/mock_agentpools"
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"
)

Expand Down
2 changes: 1 addition & 1 deletion cloud/services/agentpools/client.go → azure/services/agentpools/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/Azure/go-autorest/autorest"
"github.com/pkg/errors"

azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
0 ...tpools/mock_agentpools/agentpools_mock.go → ...tpools/mock_agentpools/agentpools_mock.go
View file
File renamed without changes.
0 ...ervices/agentpools/mock_agentpools/doc.go → ...ervices/agentpools/mock_agentpools/doc.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cloud/services/agentpools/service.go → azure/services/agentpools/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package agentpools

import (
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
)

// Service provides operations on azure resources
Expand Down
6 changes: 3 additions & 3 deletions ...ices/availabilitysets/availabilitysets.go → ...ices/availabilitysets/availabilitysets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"github.com/pkg/errors"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/cloud/converters"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/converters"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
4 changes: 2 additions & 2 deletions ...availabilitysets/availabilitysets_test.go → ...availabilitysets/availabilitysets_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
"github.com/golang/mock/gomock"
. "github.com/onsi/gomega"
"k8s.io/utils/pointer"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/resourceskus"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/resourceskus"
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"

"k8s.io/klog/klogr"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/availabilitysets/mock_availabilitysets"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/availabilitysets/mock_availabilitysets"
)

func TestReconcileAvailabilitySets(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cloud/services/availabilitysets/client.go → azure/services/availabilitysets/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute"
"github.com/Azure/go-autorest/autorest"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
0 ...availabilitysets/availabilitysets_mock.go → ...availabilitysets/availabilitysets_mock.go
View file
File renamed without changes.
0 ...sets/mock_availabilitysets/client_mock.go → ...sets/mock_availabilitysets/client_mock.go
View file
File renamed without changes.
0 ...labilitysets/mock_availabilitysets/doc.go → ...labilitysets/mock_availabilitysets/doc.go
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions cloud/services/bastionhosts/bastionhosts.go → azure/services/bastionhosts/bastionhosts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
"github.com/pkg/errors"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"

"sigs.k8s.io/cluster-api-provider-azure/cloud/converters"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/publicips"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/subnets"
"sigs.k8s.io/cluster-api-provider-azure/azure/converters"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/publicips"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/subnets"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
8 changes: 4 additions & 4 deletions ...ervices/bastionhosts/bastionhosts_test.go → ...ervices/bastionhosts/bastionhosts_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"testing"

. "github.com/onsi/gomega"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
mock_bastionhosts "sigs.k8s.io/cluster-api-provider-azure/cloud/services/bastionhosts/mocks_bastionhosts"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/publicips/mock_publicips"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/subnets/mock_subnets"
"sigs.k8s.io/cluster-api-provider-azure/azure"
mock_bastionhosts "sigs.k8s.io/cluster-api-provider-azure/azure/services/bastionhosts/mocks_bastionhosts"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/publicips/mock_publicips"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/subnets/mock_subnets"
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"

"github.com/Azure/go-autorest/autorest"
Expand Down
2 changes: 1 addition & 1 deletion cloud/services/bastionhosts/client.go → azure/services/bastionhosts/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network"
"github.com/Azure/go-autorest/autorest"

azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
2 changes: 1 addition & 1 deletion ...s/mocks_bastionhosts/bastionhosts_mock.go → ...s/mocks_bastionhosts/bastionhosts_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...onhosts/mocks_bastionhosts/client_mock.go → ...onhosts/mocks_bastionhosts/client_mock.go
View file
File renamed without changes.
0 ...es/bastionhosts/mocks_bastionhosts/doc.go → ...es/bastionhosts/mocks_bastionhosts/doc.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cloud/services/disks/client.go → azure/services/disks/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute"
"github.com/Azure/go-autorest/autorest"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
2 changes: 1 addition & 1 deletion cloud/services/disks/disks.go → azure/services/disks/disks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/go-logr/logr"
"github.com/pkg/errors"

azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
6 changes: 3 additions & 3 deletions cloud/services/disks/disks_test.go → azure/services/disks/disks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/fake"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/cloud/scope"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/disks/mock_disks"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/scope"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/disks/mock_disks"
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"
)

Expand Down
0 .../services/disks/mock_disks/client_mock.go → .../services/disks/mock_disks/client_mock.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...d/services/disks/mock_disks/disks_mock.go → ...e/services/disks/mock_disks/disks_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 cloud/services/disks/mock_disks/doc.go → azure/services/disks/mock_disks/doc.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cloud/services/groups/client.go → azure/services/groups/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-05-01/resources"
"github.com/Azure/go-autorest/autorest"

azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
4 changes: 2 additions & 2 deletions cloud/services/groups/groups.go → azure/services/groups/groups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/pkg/errors"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/cloud/converters"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/converters"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
6 changes: 3 additions & 3 deletions cloud/services/groups/groups_test.go → azure/services/groups/groups_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"k8s.io/klog/klogr"

infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/cloud/converters"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/groups/mock_groups"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/converters"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/groups/mock_groups"
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"
)

Expand Down
0 ...ervices/groups/mock_groups/client_mock.go → ...ervices/groups/mock_groups/client_mock.go
View file
File renamed without changes.
0 cloud/services/groups/mock_groups/doc.go → azure/services/groups/mock_groups/doc.go
View file
File renamed without changes.
0 ...ervices/groups/mock_groups/groups_mock.go → ...ervices/groups/mock_groups/groups_mock.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cloud/services/inboundnatrules/client.go → azure/services/inboundnatrules/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network"
"github.com/Azure/go-autorest/autorest"

azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
4 changes: 2 additions & 2 deletions ...rvices/inboundnatrules/inboundnatrules.go → ...rvices/inboundnatrules/inboundnatrules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/go-logr/logr"
"github.com/pkg/errors"

azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/loadbalancers"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/loadbalancers"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
)

Expand Down
6 changes: 3 additions & 3 deletions ...s/inboundnatrules/inboundnatrules_test.go → ...s/inboundnatrules/inboundnatrules_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"k8s.io/klog/klogr"
"k8s.io/utils/pointer"

azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/inboundnatrules/mock_inboundnatrules"
"sigs.k8s.io/cluster-api-provider-azure/cloud/services/loadbalancers/mock_loadbalancers"
"sigs.k8s.io/cluster-api-provider-azure/azure"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/inboundnatrules/mock_inboundnatrules"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/loadbalancers/mock_loadbalancers"
gomockinternal "sigs.k8s.io/cluster-api-provider-azure/internal/test/matchers/gomock"
)

Expand Down
0 ...rules/mock_inboundnatrules/client_mock.go → ...rules/mock_inboundnatrules/client_mock.go
View file
File renamed without changes.
0 ...boundnatrules/mock_inboundnatrules/doc.go → ...boundnatrules/mock_inboundnatrules/doc.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...k_inboundnatrules/inboundnatrules_mock.go → ...k_inboundnatrules/inboundnatrules_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit aca8761

Please sign in to comment.