Skip to content

Bug 2037209: update alibaba for provider spec api changes #5562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Jan 25, 2022
Merged

Bug 2037209: update alibaba for provider spec api changes #5562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e26478
update alibaba for provider spec api changes
elmiko Jan 21, 2022
2c8806f
update vendor for latest Aliababa API changes
elmiko Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,9 @@ require (
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.0.0
github.com/mitchellh/cli v1.1.2
github.com/openshift-metal3/terraform-provider-ironic v0.2.7
github.com/openshift/api v0.0.0-20211210181228-6e0b1eb97188
github.com/openshift/api v0.0.0-20220124143425-d74727069f6f
github.com/openshift/client-go v0.0.0-20211025111749-96ca2abfc56c
github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e
github.com/openshift/cluster-api-provider-alibaba v0.0.0-20211123142315-d16daa4e6349
github.com/openshift/cluster-api-provider-baremetal v0.0.0-20210924143856-c2d3ece4da38
github.com/openshift/cluster-api-provider-ibmcloud v0.0.0-20211008100740-4d7907adbd6b
github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20191219173431-2336783d4603
Expand Down
9 changes: 3 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ github.com/alibabacloud-go/tea-utils v1.3.9/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQ
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod h1:T9M45xf79ahXVelWoOBmH0y4aC1t5kXO5BxwyakgIGA=
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190412020505-60e2075261b6/go.mod h1:T9M45xf79ahXVelWoOBmH0y4aC1t5kXO5BxwyakgIGA=
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190620160927-9418d7b0cd0f/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ=
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1153/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA=
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1154 h1:+6PluSvddiDm8YF4E5LRs8kiXtC1BKCujLi4WrA4Srw=
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1154/go.mod h1:pUKYbK5JQ+1Dfxk80P0qxGqe5dkxDoabbZS7zOcouyA=
github.com/aliyun/aliyun-datahub-sdk-go v0.1.5 h1:c2TFcJ5PjkqkHr2use7Av2wHB8jVgoKxX1gmLDsysR4=
Expand Down Expand Up @@ -1519,8 +1518,8 @@ github.com/openshift/api v0.0.0-20210816181336-8ff39b776da3/go.mod h1:x81TFA31x1
github.com/openshift/api v0.0.0-20211025104849-a11323ccb6ea/go.mod h1:RsQCVJu4qhUawxxDP7pGlwU3IA4F01wYm3qKEu29Su8=
github.com/openshift/api v0.0.0-20211108165917-be1be0e89115/go.mod h1:RsQCVJu4qhUawxxDP7pGlwU3IA4F01wYm3qKEu29Su8=
github.com/openshift/api v0.0.0-20211209135129-c58d9f695577/go.mod h1:DoslCwtqUpr3d/gsbq4ZlkaMEdYqKxuypsDjorcHhME=
github.com/openshift/api v0.0.0-20211210181228-6e0b1eb97188 h1:Z9UVScJKlWgNTvFzjkbZlEX3UzptTki2RwzaLaLjnFA=
github.com/openshift/api v0.0.0-20211210181228-6e0b1eb97188/go.mod h1:DoslCwtqUpr3d/gsbq4ZlkaMEdYqKxuypsDjorcHhME=
github.com/openshift/api v0.0.0-20220124143425-d74727069f6f h1:iOTv1WudhVm2UsoST+L+ZrA5A9w57h9vmQsdlBuqG6g=
github.com/openshift/api v0.0.0-20220124143425-d74727069f6f/go.mod h1:F/eU6jgr6Q2VhMu1mSpMmygxAELd7+BUxs3NHZ25jV4=
github.com/openshift/baremetal-operator v0.0.0-20211201170610-92ffa60c683d h1:4KkYItiWENIs2bV6lKOcIMdWUnZJA+GWT9Us7z0P1UA=
github.com/openshift/baremetal-operator v0.0.0-20211201170610-92ffa60c683d/go.mod h1:p32F1DBUxfgd0JjM4rCuhJomFJokEoWR1Z/LZNL2LM8=
github.com/openshift/baremetal-operator/apis v0.0.0-20211201170610-92ffa60c683d h1:DHGXCvXWsPExutf3tgQYD4TVDSAOviLXO7Vnc42oXhw=
Expand All @@ -1533,15 +1532,14 @@ github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7/go.mo
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/build-machinery-go v0.0.0-20211213093930-7e33a7eb4ce3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3 h1:SG1aqwleU6bGD0X4mhkTNupjVnByMYYuW4XbnCPavQU=
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3/go.mod h1:cwhyki5lqBmrT0m8Im+9I7PGFaraOzcYPtEz93RcsGY=
github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e h1:2gyl9UVyjHSWzdS56KUXxQwIhENbq2x2olqoMQSA/C8=
github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e/go.mod h1:iPn+uhIe7nkP5BMHe2QnbLtg5m/AIQ1xvz9s3cig5ss=
github.com/openshift/cluster-api v0.0.0-20190805113604-f8de78af80fc h1:6Nf3TaiooyEZNk+3ZHonNOujT+HacuSj9cxyeGTc/zg=
github.com/openshift/cluster-api v0.0.0-20190805113604-f8de78af80fc/go.mod h1:mNsD1dsD4T57kV4/C6zTHke/Ro166xgnyyRZqkamiEU=
github.com/openshift/cluster-api-actuator-pkg v0.0.0-20190614215203-42228d06a2ca/go.mod h1:KNPaA64x3Ok7z538kvS2acwC5fEwvPfF0RdTx2geQEE=
github.com/openshift/cluster-api-provider-alibaba v0.0.0-20211123142315-d16daa4e6349 h1:xBbz4HEyLoofwK9r5KUyOuoOsadqjcydibtb+aPzY0A=
github.com/openshift/cluster-api-provider-alibaba v0.0.0-20211123142315-d16daa4e6349/go.mod h1:vJHKJg2+CEt1wmawpkFrg1IRlgyeaaGtzz76IM/z2os=
github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210121023454-5ffc5f422a80 h1:fFHoy/1QCLUcfo/NceEM8jGY2Tafl1BmyLa7tReN328=
github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210121023454-5ffc5f422a80/go.mod h1:JV7aXj/LZ8B4MwIQdhGxpTO2PCG8+7UKFd6FaOZCSzA=
github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210626224711-5d94c794092f/go.mod h1:GR+ocB8I+Z7JTSBdO+DMu/diBfH66lRlRpnc1KWysUM=
Expand Down Expand Up @@ -1583,7 +1581,6 @@ github.com/openshift/machine-api-operator v0.2.1-0.20201002104344-6abfb5440597/g
github.com/openshift/machine-api-operator v0.2.1-0.20210104142355-8e6ae0acdfcf/go.mod h1:U5eAHChde1XvtQy3s1Zcr7ll4X7heb0SzYpaiAwxmQc=
github.com/openshift/machine-api-operator v0.2.1-0.20210504014029-a132ec00f7dd/go.mod h1:DFZBMPtC2TYZH5NE9+2JQIpbZAnruqc9F26QmbOm9pw=
github.com/openshift/machine-api-operator v0.2.1-0.20210820103535-d50698c302f5/go.mod h1:ko7xmso6c25h9UL6Ai0I5l+6OgyVf+ebinAYXnwlGNg=
github.com/openshift/machine-api-operator v0.2.1-0.20211102083422-ee77ca7b9fd1/go.mod h1:8kWuB/zhnlBsNOyD1yz0epINZX5IodG3Z4iDwQrYKx0=
github.com/openshift/machine-api-operator v0.2.1-0.20211111133920-c8bba3e64310/go.mod h1:8kWuB/zhnlBsNOyD1yz0epINZX5IodG3Z4iDwQrYKx0=
github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8 h1:C4gCipkWTDp0B9jb0wZdLgB+HWC7EzVVwQOeNaKnTRA=
github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8/go.mod h1:fjKreLaKEeUKsyIkT4wlzIQwUVJ2ZKDUh3CI73ckYIY=
Expand Down
32 changes: 16 additions & 16 deletions pkg/asset/cluster/tfvars.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
igntypes "github.com/coreos/ignition/v2/config/v3_2/types"
coreosarch "github.com/coreos/stream-metadata-go/arch"
"github.com/ghodss/yaml"
alibabacloudprovider "github.com/openshift/cluster-api-provider-alibaba/pkg/apis/alibabacloudprovider/v1beta1"
ibmcloudprovider "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1beta1"
libvirtprovider "github.com/openshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1beta1"
ovirtprovider "github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1"
Expand All @@ -19,7 +18,8 @@ import (
awsprovider "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1"

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

preexistingnetwork := installConfig.Config.Azure.VirtualNetwork != ""
Expand Down Expand Up @@ -375,17 +375,17 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
if err != nil {
return err
}
masterConfigs := make([]*machinev1.GCPMachineProviderSpec, len(masters))
masterConfigs := make([]*machinev1beta1.GCPMachineProviderSpec, len(masters))
for i, m := range masters {
masterConfigs[i] = m.Spec.ProviderSpec.Value.Object.(*machinev1.GCPMachineProviderSpec)
masterConfigs[i] = m.Spec.ProviderSpec.Value.Object.(*machinev1beta1.GCPMachineProviderSpec)
}
workers, err := workersAsset.MachineSets()
if err != nil {
return err
}
workerConfigs := make([]*machinev1.GCPMachineProviderSpec, len(workers))
workerConfigs := make([]*machinev1beta1.GCPMachineProviderSpec, len(workers))
for i, w := range workers {
workerConfigs[i] = w.Spec.Template.Spec.ProviderSpec.Value.Object.(*machinev1.GCPMachineProviderSpec)
workerConfigs[i] = w.Spec.Template.Spec.ProviderSpec.Value.Object.(*machinev1beta1.GCPMachineProviderSpec)
}
if installConfig.Config.Publish == types.ExternalPublishingStrategy {
publicZone, err := gcpconfig.GetPublicZone(ctx, installConfig.Config.GCP.ProjectID, installConfig.Config.BaseDomain)
Expand Down Expand Up @@ -677,9 +677,9 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
if err != nil {
return err
}
controlPlaneConfigs := make([]*machinev1.VSphereMachineProviderSpec, len(controlPlanes))
controlPlaneConfigs := make([]*machinev1beta1.VSphereMachineProviderSpec, len(controlPlanes))
for i, c := range controlPlanes {
controlPlaneConfigs[i] = c.Spec.ProviderSpec.Value.Object.(*machinev1.VSphereMachineProviderSpec)
controlPlaneConfigs[i] = c.Spec.ProviderSpec.Value.Object.(*machinev1beta1.VSphereMachineProviderSpec)
}

// Set this flag to use an existing folder specified in the install-config. Otherwise, create one.
Expand Down Expand Up @@ -724,17 +724,17 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
if err != nil {
return errors.Wrapf(err, "failed to get master machine info")
}
masterConfigs := make([]*alibabacloudprovider.AlibabaCloudMachineProviderConfig, len(masters))
masterConfigs := make([]*machinev1.AlibabaCloudMachineProviderConfig, len(masters))
for i, m := range masters {
masterConfigs[i] = m.Spec.ProviderSpec.Value.Object.(*alibabacloudprovider.AlibabaCloudMachineProviderConfig)
masterConfigs[i] = m.Spec.ProviderSpec.Value.Object.(*machinev1.AlibabaCloudMachineProviderConfig)
}
workers, err := workersAsset.MachineSets()
if err != nil {
return errors.Wrapf(err, "failed to get worker machine info")
}
workerConfigs := make([]*alibabacloudprovider.AlibabaCloudMachineProviderConfig, len(workers))
workerConfigs := make([]*machinev1.AlibabaCloudMachineProviderConfig, len(workers))
for i, w := range workers {
workerConfigs[i] = w.Spec.Template.Spec.ProviderSpec.Value.Object.(*alibabacloudprovider.AlibabaCloudMachineProviderConfig)
workerConfigs[i] = w.Spec.Template.Spec.ProviderSpec.Value.Object.(*machinev1.AlibabaCloudMachineProviderConfig)
}

natGatewayZones, err := client.ListEnhanhcedNatGatewayAvailableZones()
Expand Down
74 changes: 49 additions & 25 deletions pkg/asset/machines/alibabacloud/machines.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ package alibabacloud
import (
"fmt"

machineapi "github.com/openshift/api/machine/v1beta1"
alibabacloudprovider "github.com/openshift/cluster-api-provider-alibaba/pkg/apis/alibabacloudprovider/v1beta1"
machinev1 "github.com/openshift/api/machine/v1"
machinev1beta1 "github.com/openshift/api/machine/v1beta1"

"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -17,7 +18,7 @@ import (
)

// Machines returns a list of machines for a machinepool.
func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, role, userDataSecret string, resourceTags map[string]string, vswitchMaps map[string]string) ([]machineapi.Machine, error) {
func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, role, userDataSecret string, resourceTags map[string]string, vswitchMaps map[string]string) ([]machinev1beta1.Machine, error) {
if configPlatform := config.Platform.Name(); configPlatform != alibabacloud.Name {
return nil, fmt.Errorf("non-AlibabaCloud configuration: %q", configPlatform)
}
Expand All @@ -33,15 +34,15 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
total = *pool.Replicas
}

var machines []machineapi.Machine
var machines []machinev1beta1.Machine
for idx := int64(0); idx < total; idx++ {
zoneID := azs[int(idx)%len(azs)]
vswitchID := vswitchMaps[zoneID]
provider, err := provider(clusterID, platform, mpool, zoneID, role, userDataSecret, resourceTags, vswitchID)
if err != nil {
return nil, errors.Wrap(err, "failed to create provider")
}
machine := machineapi.Machine{
machine := machinev1beta1.Machine{
TypeMeta: metav1.TypeMeta{
APIVersion: "machine.openshift.io/v1beta1",
Kind: "Machine",
Expand All @@ -55,8 +56,8 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
"machine.openshift.io/cluster-api-machine-type": role,
},
},
Spec: machineapi.MachineSpec{
ProviderSpec: machineapi.ProviderSpec{
Spec: machinev1beta1.MachineSpec{
ProviderSpec: machinev1beta1.ProviderSpec{
Value: &runtime.RawExtension{Object: provider},
},
},
Expand All @@ -75,51 +76,74 @@ func provider(clusterID string,
userDataSecret string,
resourceTags map[string]string,
vswitchID string,
) (*alibabacloudprovider.AlibabaCloudMachineProviderConfig, error) {
) (*machinev1.AlibabaCloudMachineProviderConfig, error) {
tags, err := tagsFromResourceTags(clusterID, resourceTags)
if err != nil {
return nil, errors.Wrap(err, "failed to create alibabacloudprovider.Tag from Tags")
}
sgResourceRef := []alibabacloudprovider.AlibabaResourceReference{
sgTags := append(tags, machinev1.Tag{
Key: "Name",
Value: fmt.Sprintf("%s-sg-%s", clusterID, role),
})
sgResourceRef := []machinev1.AlibabaResourceReference{
{
Tags: append(tags, alibabacloudprovider.Tag{
Key: "Name",
Value: fmt.Sprintf("%s-sg-%s", clusterID, role),
}),
Type: machinev1.AlibabaResourceReferenceTypeTags,
Tags: &sgTags,
},
}
config := &alibabacloudprovider.AlibabaCloudMachineProviderConfig{
config := &machinev1.AlibabaCloudMachineProviderConfig{
TypeMeta: metav1.TypeMeta{
APIVersion: "alibabacloudmachineproviderconfig.openshift.io/v1beta1",
APIVersion: "machine.openshift.io/v1",
Kind: "AlibabaCloudMachineProviderConfig",
},
ImageID: mpool.ImageID,
InstanceType: mpool.InstanceType,
SystemDisk: alibabacloudprovider.SystemDiskProperties{
SystemDisk: machinev1.SystemDiskProperties{
Category: string(mpool.SystemDiskCategory),
Size: mpool.SystemDiskSize,
Size: int64(mpool.SystemDiskSize),
},
RegionID: platform.Region,
ResourceGroupID: platform.ResourceGroupID,
ZoneID: zoneID,
UserDataSecret: &corev1.LocalObjectReference{Name: userDataSecret},
CredentialsSecret: &corev1.LocalObjectReference{Name: "alibabacloud-credentials"},
Tags: tags,
RAMRoleName: fmt.Sprintf("%s-role-%s", clusterID, role),
SecurityGroups: sgResourceRef,
}
config.VSwitch = alibabacloudprovider.AlibabaResourceReference{
ID: vswitchID,
Tags: append(tags, alibabacloudprovider.Tag{

if platform.ResourceGroupID != "" {
config.ResourceGroup = machinev1.AlibabaResourceReference{
Type: machinev1.AlibabaResourceReferenceTypeID,
ID: &platform.ResourceGroupID,
}
} else {
rgname := platform.ClusterResourceGroupName(clusterID)
config.ResourceGroup = machinev1.AlibabaResourceReference{
Type: machinev1.AlibabaResourceReferenceTypeName,
Name: &rgname,
}
}

if vswitchID != "" {
config.VSwitch = machinev1.AlibabaResourceReference{
Type: machinev1.AlibabaResourceReferenceTypeID,
ID: &vswitchID,
}
} else {
vstags := append(tags, machinev1.Tag{
Key: "Name",
Value: fmt.Sprintf("%s-vswitch-%s", clusterID, zoneID),
}),
})
config.VSwitch = machinev1.AlibabaResourceReference{
Type: machinev1.AlibabaResourceReferenceTypeTags,
Tags: &vstags,
}
}
return config, nil
}

func tagsFromResourceTags(clusterID string, resourceTags map[string]string) ([]alibabacloudprovider.Tag, error) {
tags := []alibabacloudprovider.Tag{
func tagsFromResourceTags(clusterID string, resourceTags map[string]string) ([]machinev1.Tag, error) {
tags := []machinev1.Tag{
{Key: fmt.Sprintf("kubernetes.io/cluster/%s", clusterID), Value: "owned"},
{Key: "GISV", Value: "ocp"},
{Key: "sigs.k8s.io/cloud-provider-alibaba/origin", Value: "ocp"},
Expand All @@ -132,7 +156,7 @@ func tagsFromResourceTags(clusterID string, resourceTags map[string]string) ([]a
if forbiddenTags.Has(k) {
return nil, fmt.Errorf("user tags may not clobber %s", k)
}
tags = append(tags, alibabacloudprovider.Tag{Key: k, Value: v})
tags = append(tags, machinev1.Tag{Key: k, Value: v})
}
return tags, nil
}
Loading