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

Rename json:additionalSecurityGroupIDs to additionalSecurityGroups

This commit is contained in:
Thomas Peitz 2017-01-30 18:55:51 +01:00
parent 3b2f07e04b
commit 640d28dce4
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/instancegroup.go
View File

@ -81,8 +81,8 @@ type InstanceGroupSpec struct {
// AssociatePublicIP is true if we want instances to have a public IP // AssociatePublicIP is true if we want instances to have a public IP
AssociatePublicIP *bool `json:"associatePublicIp,omitempty"` AssociatePublicIP *bool `json:"associatePublicIp,omitempty"`
// AdditionalSecurityGroupIDs attaches additional security groups (e.g. i-123456) // AdditionalSecurityGroups attaches additional security groups (e.g. i-123456)
AdditionalSecurityGroupIDs []string `json:"additionalSecurityGroupIDs,omitempty"` AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"`
// CloudLabels indicates the labels for instances in this group, at the AWS level // CloudLabels indicates the labels for instances in this group, at the AWS level
CloudLabels map[string]string `json:"cloudLabels,omitempty"` CloudLabels map[string]string `json:"cloudLabels,omitempty"`

4
pkg/apis/kops/v1alpha1/instancegroup.go
View File

@ -69,8 +69,8 @@ type InstanceGroupSpec struct {
// AssociatePublicIP is true if we want instances to have a public IP // AssociatePublicIP is true if we want instances to have a public IP
AssociatePublicIP *bool `json:"associatePublicIp,omitempty"` AssociatePublicIP *bool `json:"associatePublicIp,omitempty"`
// AdditionalSecurityGroupIDs attaches additional security groups (e.g. i-123456) // AdditionalSecurityGroups attaches additional security groups (e.g. i-123456)
AdditionalSecurityGroupIDs []string `json:"additionalSecurityGroupIDs,omitempty"` AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"`
// CloudLabels indicates the labels for instances in this group, at the AWS level // CloudLabels indicates the labels for instances in this group, at the AWS level
CloudLabels map[string]string `json:"cloudLabels,omitempty"` CloudLabels map[string]string `json:"cloudLabels,omitempty"`

4
pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View File

@ -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 // WARNING: in.Zones requires manual conversion: does not exist in peer-type
out.MaxPrice = in.MaxPrice out.MaxPrice = in.MaxPrice
out.AssociatePublicIP = in.AssociatePublicIP out.AssociatePublicIP = in.AssociatePublicIP
out.AdditionalSecurityGroupIDs = in.AdditionalSecurityGroupIDs out.AdditionalSecurityGroups = in.AdditionalSecurityGroups
out.CloudLabels = in.CloudLabels out.CloudLabels = in.CloudLabels
out.NodeLabels = in.NodeLabels out.NodeLabels = in.NodeLabels
return nil 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 // WARNING: in.Subnets requires manual conversion: does not exist in peer-type
out.MaxPrice = in.MaxPrice out.MaxPrice = in.MaxPrice
out.AssociatePublicIP = in.AssociatePublicIP out.AssociatePublicIP = in.AssociatePublicIP
out.AdditionalSecurityGroupIDs = in.AdditionalSecurityGroupIDs out.AdditionalSecurityGroups = in.AdditionalSecurityGroups
out.CloudLabels = in.CloudLabels out.CloudLabels = in.CloudLabels
out.NodeLabels = in.NodeLabels out.NodeLabels = in.NodeLabels
return nil return nil

4
pkg/apis/kops/v1alpha2/instancegroup.go
View File

@ -76,8 +76,8 @@ type InstanceGroupSpec struct {
// AssociatePublicIP is true if we want instances to have a public IP // AssociatePublicIP is true if we want instances to have a public IP
AssociatePublicIP *bool `json:"associatePublicIp,omitempty"` AssociatePublicIP *bool `json:"associatePublicIp,omitempty"`
// AdditionalSecurityGroupIDs attaches additional security groups (e.g. i-123456) // AdditionalSecurityGroups attaches additional security groups (e.g. i-123456)
AdditionalSecurityGroupIDs []string `json:"additionalSecurityGroupIDs,omitempty"` AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"`
// CloudLabels indicates the labels for instances in this group, at the AWS level // CloudLabels indicates the labels for instances in this group, at the AWS level
CloudLabels map[string]string `json:"cloudLabels,omitempty"` CloudLabels map[string]string `json:"cloudLabels,omitempty"`

2
pkg/model/autoscalinggroup.go
View File

@ -66,7 +66,7 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
SecurityGroups: []*awstasks.SecurityGroup{ SecurityGroups: []*awstasks.SecurityGroup{
b.LinkToSecurityGroup(ig.Spec.Role), b.LinkToSecurityGroup(ig.Spec.Role),
}, },
AdditionalSecurityGroupIDs: ig.Spec.AdditionalSecurityGroupIDs, AdditionalSecurityGroupIDs: ig.Spec.AdditionalSecurityGroups,
IAMInstanceProfile: b.LinkToIAMInstanceProfile(ig), IAMInstanceProfile: b.LinkToIAMInstanceProfile(ig),
ImageID: s(ig.Spec.Image), ImageID: s(ig.Spec.Image),
InstanceType: s(ig.Spec.MachineType), InstanceType: s(ig.Spec.MachineType),