diff --git a/pkg/asset/ignition/machine/master_test.go b/pkg/asset/ignition/machine/master_test.go index 950ae921a97..9ad3f66bfb6 100644 --- a/pkg/asset/ignition/machine/master_test.go +++ b/pkg/asset/ignition/machine/master_test.go @@ -32,7 +32,8 @@ func TestMasterGenerate(t *testing.T) { }, Platform: types.Platform{ AWS: &types.AWSPlatform{ - Region: "us-east", + Region: "us-east", + InstanceType: "m4.large", }, }, Machines: []types.MachinePool{ diff --git a/pkg/asset/ignition/machine/worker_test.go b/pkg/asset/ignition/machine/worker_test.go index 680badc62a2..29f099bd7d1 100644 --- a/pkg/asset/ignition/machine/worker_test.go +++ b/pkg/asset/ignition/machine/worker_test.go @@ -27,7 +27,8 @@ func TestWorkerGenerate(t *testing.T) { }, Platform: types.Platform{ AWS: &types.AWSPlatform{ - Region: "us-east", + Region: "us-east", + InstanceType: "m4.large", }, }, }, diff --git a/pkg/asset/manifests/machine-api-operator.go b/pkg/asset/manifests/machine-api-operator.go index cd34963ed6d..5d1b16dba22 100644 --- a/pkg/asset/manifests/machine-api-operator.go +++ b/pkg/asset/manifests/machine-api-operator.go @@ -48,11 +48,12 @@ type libvirtConfig struct { } type awsConfig struct { - ClusterName string `json:"clusterName"` - ClusterID string `json:"clusterID"` - Region string `json:"region"` AvailabilityZone string `json:"availabilityZone"` + ClusterID string `json:"clusterID"` + ClusterName string `json:"clusterName"` Image string `json:"image"` + InstanceType string `json:"instanceType"` + Region string `json:"region"` Replicas int `json:"replicas"` } @@ -109,6 +110,7 @@ func (mao *machineAPIOperator) Generate(dependencies asset.Parents) error { AvailabilityZone: "", Image: ami, Replicas: int(*installConfig.Config.Machines[1].Replicas), + InstanceType: installConfig.Config.Machines[1].Platform.AWS.InstanceType, } case installConfig.Config.Platform.Libvirt != nil: mao.config.Libvirt = &libvirtConfig{