diff --git a/pkg/apis/kops/instancegroup.go b/pkg/apis/kops/instancegroup.go index 4085f60a35..cf8346d907 100644 --- a/pkg/apis/kops/instancegroup.go +++ b/pkg/apis/kops/instancegroup.go @@ -81,8 +81,8 @@ type InstanceGroupSpec struct { // AssociatePublicIP is true if we want instances to have a public IP AssociatePublicIP *bool `json:"associatePublicIp,omitempty"` - // AdditionalSecurityGroupIDs attaches additional security groups (e.g. i-123456) - AdditionalSecurityGroupIDs []string `json:"additionalSecurityGroupIDs,omitempty"` + // AdditionalSecurityGroups attaches additional security groups (e.g. i-123456) + AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"` // CloudLabels indicates the labels for instances in this group, at the AWS level CloudLabels map[string]string `json:"cloudLabels,omitempty"` diff --git a/pkg/apis/kops/v1alpha1/instancegroup.go b/pkg/apis/kops/v1alpha1/instancegroup.go index 3f7e5667ab..9024f5344a 100644 --- a/pkg/apis/kops/v1alpha1/instancegroup.go +++ b/pkg/apis/kops/v1alpha1/instancegroup.go @@ -69,8 +69,8 @@ type InstanceGroupSpec struct { // AssociatePublicIP is true if we want instances to have a public IP AssociatePublicIP *bool `json:"associatePublicIp,omitempty"` - // AdditionalSecurityGroupIDs attaches additional security groups (e.g. i-123456) - AdditionalSecurityGroupIDs []string `json:"additionalSecurityGroupIDs,omitempty"` + // AdditionalSecurityGroups attaches additional security groups (e.g. i-123456) + AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"` // CloudLabels indicates the labels for instances in this group, at the AWS level CloudLabels map[string]string `json:"cloudLabels,omitempty"` diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index eac91ba9a9..8ef3d5f8a5 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -899,7 +899,7 @@ func autoConvert_v1alpha1_InstanceGroupSpec_To_kops_InstanceGroupSpec(in *Instan // WARNING: in.Zones requires manual conversion: does not exist in peer-type out.MaxPrice = in.MaxPrice out.AssociatePublicIP = in.AssociatePublicIP - out.AdditionalSecurityGroupIDs = in.AdditionalSecurityGroupIDs + out.AdditionalSecurityGroups = in.AdditionalSecurityGroups out.CloudLabels = in.CloudLabels out.NodeLabels = in.NodeLabels return nil @@ -916,7 +916,7 @@ func autoConvert_kops_InstanceGroupSpec_To_v1alpha1_InstanceGroupSpec(in *kops.I // WARNING: in.Subnets requires manual conversion: does not exist in peer-type out.MaxPrice = in.MaxPrice out.AssociatePublicIP = in.AssociatePublicIP - out.AdditionalSecurityGroupIDs = in.AdditionalSecurityGroupIDs + out.AdditionalSecurityGroups = in.AdditionalSecurityGroups out.CloudLabels = in.CloudLabels out.NodeLabels = in.NodeLabels return nil diff --git a/pkg/apis/kops/v1alpha2/instancegroup.go b/pkg/apis/kops/v1alpha2/instancegroup.go index 9713eb484c..745002a3ea 100644 --- a/pkg/apis/kops/v1alpha2/instancegroup.go +++ b/pkg/apis/kops/v1alpha2/instancegroup.go @@ -76,8 +76,8 @@ type InstanceGroupSpec struct { // AssociatePublicIP is true if we want instances to have a public IP AssociatePublicIP *bool `json:"associatePublicIp,omitempty"` - // AdditionalSecurityGroupIDs attaches additional security groups (e.g. i-123456) - AdditionalSecurityGroupIDs []string `json:"additionalSecurityGroupIDs,omitempty"` + // AdditionalSecurityGroups attaches additional security groups (e.g. i-123456) + AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"` // CloudLabels indicates the labels for instances in this group, at the AWS level CloudLabels map[string]string `json:"cloudLabels,omitempty"` diff --git a/pkg/model/autoscalinggroup.go b/pkg/model/autoscalinggroup.go index ec76e3cb2e..51ae802eeb 100644 --- a/pkg/model/autoscalinggroup.go +++ b/pkg/model/autoscalinggroup.go @@ -66,7 +66,7 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error { SecurityGroups: []*awstasks.SecurityGroup{ b.LinkToSecurityGroup(ig.Spec.Role), }, - AdditionalSecurityGroupIDs: ig.Spec.AdditionalSecurityGroupIDs, + AdditionalSecurityGroupIDs: ig.Spec.AdditionalSecurityGroups, IAMInstanceProfile: b.LinkToIAMInstanceProfile(ig), ImageID: s(ig.Spec.Image), InstanceType: s(ig.Spec.MachineType),