Skip to content

Commit

Permalink
Remove use of Azure Cluster API Provider
Browse files Browse the repository at this point in the history 
The AzureMachineProviderSpec definition has moved to openshift/api.
We should be using that API instead, and can remove our use of CAPZ.

The machine API has a dependence on the CAPZ, so we cannot remove
the replace in go.mod until we can remove our dependence on the MAO.
  • Loading branch information
@patrickdillon
patrickdillon committed Dec 10, 2021
1 parent 46acb72 commit f9725dd
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 26 deletions.
9 changes: 4 additions & 5 deletions pkg/asset/cluster/tfvars.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
awsprovider "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1"
azureprovider "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1"

configv1 "github.com/openshift/api/config/v1"
machinev1 "github.com/openshift/api/machine/v1beta1"
Expand Down Expand Up @@ -311,17 +310,17 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
if err != nil {
return err
}
masterConfigs := make([]*azureprovider.AzureMachineProviderSpec, len(masters))
masterConfigs := make([]*machinev1.AzureMachineProviderSpec, len(masters))
for i, m := range masters {
masterConfigs[i] = m.Spec.ProviderSpec.Value.Object.(*azureprovider.AzureMachineProviderSpec)
masterConfigs[i] = m.Spec.ProviderSpec.Value.Object.(*machinev1.AzureMachineProviderSpec)
}
workers, err := workersAsset.MachineSets()
if err != nil {
return err
}
workerConfigs := make([]*azureprovider.AzureMachineProviderSpec, len(workers))
workerConfigs := make([]*machinev1.AzureMachineProviderSpec, len(workers))
for i, w := range workers {
workerConfigs[i] = w.Spec.Template.Spec.ProviderSpec.Value.Object.(*azureprovider.AzureMachineProviderSpec)
workerConfigs[i] = w.Spec.Template.Spec.ProviderSpec.Value.Object.(*machinev1.AzureMachineProviderSpec)
}

preexistingnetwork := installConfig.Config.Azure.VirtualNetwork != ""
Expand Down
13 changes: 6 additions & 7 deletions pkg/asset/machines/azure/machines.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
machineapi "github.com/openshift/api/machine/v1beta1"
"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/azure"
azureprovider "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1"
)

const (
Expand Down Expand Up @@ -79,7 +78,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
return machines, nil
}

func provider(platform *azure.Platform, mpool *azure.MachinePool, osImage string, userDataSecret string, clusterID string, role string, azIdx *int) (*azureprovider.AzureMachineProviderSpec, error) {
func provider(platform *azure.Platform, mpool *azure.MachinePool, osImage string, userDataSecret string, clusterID string, role string, azIdx *int) (*machineapi.AzureMachineProviderSpec, error) {
var az *string
if len(mpool.Zones) > 0 && azIdx != nil {
az = &mpool.Zones[*azIdx]
Expand All @@ -106,22 +105,22 @@ func provider(platform *azure.Platform, mpool *azure.MachinePool, osImage string
managedIdentity = ""
}

return &azureprovider.AzureMachineProviderSpec{
return &machineapi.AzureMachineProviderSpec{
TypeMeta: metav1.TypeMeta{
APIVersion: "azureproviderconfig.openshift.io/v1beta1",
APIVersion: "machine.openshift.io/v1beta1",
Kind: "AzureMachineProviderSpec",
},
UserDataSecret: &corev1.SecretReference{Name: userDataSecret},
CredentialsSecret: &corev1.SecretReference{Name: cloudsSecret, Namespace: cloudsSecretNamespace},
Location: platform.Region,
VMSize: mpool.InstanceType,
Image: azureprovider.Image{
Image: machineapi.Image{
ResourceID: fmt.Sprintf("/resourceGroups/%s/providers/Microsoft.Compute/images/%s", rg, clusterID),
},
OSDisk: azureprovider.OSDisk{
OSDisk: machineapi.OSDisk{
OSType: "Linux",
DiskSizeGB: mpool.OSDisk.DiskSizeGB,
ManagedDisk: azureprovider.ManagedDiskParameters{
ManagedDisk: machineapi.ManagedDiskParameters{
StorageAccountType: mpool.OSDisk.DiskType,
},
},
Expand Down
6 changes: 1 addition & 5 deletions pkg/asset/machines/master.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
awsapi "sigs.k8s.io/cluster-api-provider-aws/pkg/apis"
awsprovider "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1"
azureapi "sigs.k8s.io/cluster-api-provider-azure/pkg/apis"
azureprovider "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1"
openstackapi "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis"
openstackprovider "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"

Expand Down Expand Up @@ -535,22 +533,20 @@ func (m *Master) Machines() ([]machineapi.Machine, error) {
scheme := runtime.NewScheme()
alibabacloudapi.AddToScheme(scheme)
awsapi.AddToScheme(scheme)
azureapi.AddToScheme(scheme)
baremetalapi.AddToScheme(scheme)
gcpapi.AddToScheme(scheme)
ibmcloudapi.AddToScheme(scheme)
libvirtapi.AddToScheme(scheme)
openstackapi.AddToScheme(scheme)
ovirtproviderapi.AddToScheme(scheme)
// Add vsphere types to scheme
scheme.AddKnownTypes(machineapi.SchemeGroupVersion,
&machineapi.VSphereMachineProviderSpec{},
&machineapi.AzureMachineProviderSpec{},
)
machineapi.AddToScheme(scheme)
decoder := serializer.NewCodecFactory(scheme).UniversalDecoder(
alibabacloudprovider.SchemeGroupVersion,
awsprovider.SchemeGroupVersion,
azureprovider.SchemeGroupVersion,
baremetalprovider.SchemeGroupVersion,
gcpprovider.SchemeGroupVersion,
ibmcloudprovider.SchemeGroupVersion,
Expand Down
6 changes: 1 addition & 5 deletions pkg/asset/machines/worker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
awsapi "sigs.k8s.io/cluster-api-provider-aws/pkg/apis"
awsprovider "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1"
azureapi "sigs.k8s.io/cluster-api-provider-azure/pkg/apis"
azureprovider "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1"
openstackapi "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis"
openstackprovider "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"

Expand Down Expand Up @@ -538,22 +536,20 @@ func (w *Worker) MachineSets() ([]machineapi.MachineSet, error) {
scheme := runtime.NewScheme()
alibabacloudapi.AddToScheme(scheme)
awsapi.AddToScheme(scheme)
azureapi.AddToScheme(scheme)
baremetalapi.AddToScheme(scheme)
gcpapi.AddToScheme(scheme)
ibmcloudapi.AddToScheme(scheme)
libvirtapi.AddToScheme(scheme)
openstackapi.AddToScheme(scheme)
ovirtproviderapi.AddToScheme(scheme)
// Add vsphere types to scheme
scheme.AddKnownTypes(machineapi.SchemeGroupVersion,
&machineapi.VSphereMachineProviderSpec{},
&machineapi.AzureMachineProviderSpec{},
)
machineapi.AddToScheme(scheme)
decoder := serializer.NewCodecFactory(scheme).UniversalDecoder(
alibabacloudprovider.SchemeGroupVersion,
awsprovider.SchemeGroupVersion,
azureprovider.SchemeGroupVersion,
baremetalprovider.SchemeGroupVersion,
gcpprovider.SchemeGroupVersion,
ibmcloudprovider.SchemeGroupVersion,
Expand Down
7 changes: 3 additions & 4 deletions pkg/tfvars/azure/azure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/pkg/errors"

azureprovider "sigs.k8s.io/cluster-api-provider-azure/pkg/apis/azureprovider/v1beta1"

machineapi "github.com/openshift/api/machine/v1beta1"
"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/azure"
"github.com/openshift/installer/pkg/types/azure/defaults"
Expand Down Expand Up @@ -51,8 +50,8 @@ type TFVarsSources struct {
ARMEndpoint string
ResourceGroupName string
BaseDomainResourceGroupName string
MasterConfigs []*azureprovider.AzureMachineProviderSpec
WorkerConfigs []*azureprovider.AzureMachineProviderSpec
MasterConfigs []*machineapi.AzureMachineProviderSpec
WorkerConfigs []*machineapi.AzureMachineProviderSpec
ImageURL string
PreexistingNetwork bool
Publish types.PublishingStrategy
Expand Down

0 comments on commit f9725dd

Please sign in to comment.