kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor LaunchTemplate.Tenancy

This commit is contained in:
John Gardiner Myers 2021-05-11 14:09:55 -07:00
parent 4d9018282c
commit 4a5e46922f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/model/awsmodel/autoscalinggroup.go
View File

@ -186,7 +186,6 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
RootVolumeKmsKey: fi.String(rootVolumeKmsKey), RootVolumeKmsKey: fi.String(rootVolumeKmsKey),
SecurityGroups: lc.SecurityGroups, SecurityGroups: lc.SecurityGroups,
Tags: tags, Tags: tags,
Tenancy: lc.Tenancy,
UserData: lc.UserData, UserData: lc.UserData,
} }
@ -293,6 +292,10 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
lt.SpotDurationInMinutes = ig.Spec.SpotDurationInMinutes lt.SpotDurationInMinutes = ig.Spec.SpotDurationInMinutes
} }
if ig.Spec.Tenancy != "" {
lt.Tenancy = fi.String(ig.Spec.Tenancy)
}
return lt, nil return lt, nil
} }
@ -333,10 +336,6 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateHelper(c *fi.ModelBuil
} }
} }
if ig.Spec.Tenancy != "" {
t.Tenancy = fi.String(ig.Spec.Tenancy)
}
// @step: add any additional security groups to the instancegroup // @step: add any additional security groups to the instancegroup
for _, id := range ig.Spec.AdditionalSecurityGroups { for _, id := range ig.Spec.AdditionalSecurityGroups {
sgTask := &awstasks.SecurityGroup{ sgTask := &awstasks.SecurityGroup{