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

Don't override name of ELB API SecurityGroup 

We don't need to because there can be only one, and it risks breaking
other callers of LinkToELBSecurityGroup (though admittedly there
aren't any!)
This commit is contained in:
Justin Santa Barbara 2018-10-02 11:57:37 -07:00
parent f67d6e86b2
commit e5d8b37772
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/model/awsmodel/api_loadbalancer.go
View File

@ -110,17 +110,8 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error {
listeners["443"] = &awstasks.LoadBalancerListener{InstancePort: 443, SSLCertificateID: lbSpec.SSLCertificate} listeners["443"] = &awstasks.LoadBalancerListener{InstancePort: 443, SSLCertificateID: lbSpec.SSLCertificate}
} }
var sgLink *awstasks.SecurityGroup
if lbSpec.SecurityGroupOverride != nil { if lbSpec.SecurityGroupOverride != nil {
glog.V(1).Infof("WARNING: You are overwriting the Load Balancers, Security Group. When this is done you are responsible for ensure the correct rules!") glog.V(1).Infof("WARNING: You are overwriting the Load Balancers, Security Group. When this is done you are responsible for ensure the correct rules!")
sgLink = &awstasks.SecurityGroup{
Name: lbSpec.SecurityGroupOverride,
ID: lbSpec.SecurityGroupOverride,
Shared: fi.Bool(true),
}
} else {
sgLink = b.LinkToELBSecurityGroup("api")
} }
elb = &awstasks.LoadBalancer{ elb = &awstasks.LoadBalancer{
@ -129,7 +120,7 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error {
LoadBalancerName: s(loadBalancerName), LoadBalancerName: s(loadBalancerName),
SecurityGroups: []*awstasks.SecurityGroup{ SecurityGroups: []*awstasks.SecurityGroup{
sgLink, b.LinkToELBSecurityGroup("api"),
}, },
Subnets: elbSubnets, Subnets: elbSubnets,
Listeners: listeners, Listeners: listeners,
@ -174,7 +165,6 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error {
lbSG.Tags = b.CloudTags(*lbSG.Name, false) lbSG.Tags = b.CloudTags(*lbSG.Name, false)
if lbSpec.SecurityGroupOverride != nil { if lbSpec.SecurityGroupOverride != nil {
lbSG.Name = fi.String(*lbSpec.SecurityGroupOverride)
lbSG.ID = fi.String(*lbSpec.SecurityGroupOverride) lbSG.ID = fi.String(*lbSpec.SecurityGroupOverride)
lbSG.Shared = fi.Bool(true) lbSG.Shared = fi.Bool(true)
} }