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

Rename ImageId to ImageID for launchconfiguration

This commit is contained in:
Xiaoyu Zhong 2019-12-31 14:12:52 +08:00
parent ccedac9f1a
commit cb93ba822a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/alimodel/scalinggroup.go
View File

@ -118,7 +118,7 @@ func (b *ScalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
SecurityGroup: b.LinkToSecurityGroup(ig.Spec.Role), SecurityGroup: b.LinkToSecurityGroup(ig.Spec.Role),
RAMRole: b.LinkToRAMRole(ig.Spec.Role), RAMRole: b.LinkToRAMRole(ig.Spec.Role),
ImageId: s(ig.Spec.Image), ImageID: s(ig.Spec.Image),
InstanceType: s(instanceType), InstanceType: s(instanceType),
SystemDiskSize: i(int(volumeSize)), SystemDiskSize: i(int(volumeSize)),
SystemDiskCategory: s(volumeType), SystemDiskCategory: s(volumeType),

12
upup/pkg/fi/cloudup/alitasks/launchconfiguration.go
View File

@ -38,7 +38,7 @@ type LaunchConfiguration struct {
Name *string Name *string
ConfigurationId *string ConfigurationId *string
ImageId *string ImageID *string
InstanceType *string InstanceType *string
SystemDiskSize *int SystemDiskSize *int
SystemDiskCategory *string SystemDiskCategory *string
@ -92,7 +92,7 @@ func (l *LaunchConfiguration) Find(c *fi.Context) (*LaunchConfiguration, error)
lc := configList[0] lc := configList[0]
actual := &LaunchConfiguration{ actual := &LaunchConfiguration{
ImageId: fi.String(lc.ImageId), ImageID: fi.String(lc.ImageId),
InstanceType: fi.String(lc.InstanceType), InstanceType: fi.String(lc.InstanceType),
SystemDiskSize: fi.Int(lc.SystemDiskSize), SystemDiskSize: fi.Int(lc.SystemDiskSize),
SystemDiskCategory: fi.String(string(lc.SystemDiskCategory)), SystemDiskCategory: fi.String(string(lc.SystemDiskCategory)),
@ -146,14 +146,14 @@ func (l *LaunchConfiguration) Run(c *fi.Context) error {
func (_ *LaunchConfiguration) CheckChanges(a, e, changes *LaunchConfiguration) error { func (_ *LaunchConfiguration) CheckChanges(a, e, changes *LaunchConfiguration) error {
//Configuration can not be modified, we need to create a new one //Configuration can not be modified, we need to create a new one
if e.Name == nil { if e.Name == nil {
return fi.RequiredField("Name") return fi.RequiredField("Name")
} }
if e.ImageId == nil { if e.ImageID == nil {
return fi.RequiredField("ImageId") return fi.RequiredField("ImageId")
} }
if e.InstanceType == nil { if e.InstanceType == nil {
return fi.RequiredField("InstanceType") return fi.RequiredField("InstanceType")
} }
@ -168,7 +168,7 @@ func (_ *LaunchConfiguration) RenderALI(t *aliup.ALIAPITarget, a, e, changes *La
createScalingConfiguration := &ess.CreateScalingConfigurationArgs{ createScalingConfiguration := &ess.CreateScalingConfigurationArgs{
ScalingGroupId: fi.StringValue(e.ScalingGroup.ScalingGroupId), ScalingGroupId: fi.StringValue(e.ScalingGroup.ScalingGroupId),
ScalingConfigurationName: fi.StringValue(e.Name), ScalingConfigurationName: fi.StringValue(e.Name),
ImageId: fi.StringValue(e.ImageId), ImageId: fi.StringValue(e.ImageID),
InstanceType: fi.StringValue(e.InstanceType), InstanceType: fi.StringValue(e.InstanceType),
SecurityGroupId: fi.StringValue(e.SecurityGroup.SecurityGroupId), SecurityGroupId: fi.StringValue(e.SecurityGroup.SecurityGroupId),
SystemDisk_Size: common.UnderlineString(strconv.Itoa(fi.IntValue(e.SystemDiskSize))), SystemDisk_Size: common.UnderlineString(strconv.Itoa(fi.IntValue(e.SystemDiskSize))),
@ -257,7 +257,7 @@ func (_ *LaunchConfiguration) RenderTerraform(t *terraform.TerraformTarget, a, e
userData := base64.StdEncoding.EncodeToString(data) userData := base64.StdEncoding.EncodeToString(data)
tf := &terraformLaunchConfiguration{ tf := &terraformLaunchConfiguration{
ImageID: e.ImageId, ImageID: e.ImageID,
InstanceType: e.InstanceType, InstanceType: e.InstanceType,
SystemDiskCategory: e.SystemDiskCategory, SystemDiskCategory: e.SystemDiskCategory,
UserData: &userData, UserData: &userData,