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

Merge pull request #6175 from rdrgmnzs/sg_fix 

Fix for when node and master use the same SG.
This commit is contained in:
Kubernetes Prow Robot 2018-12-06 05:57:11 -08:00 committed by GitHub
parent 6af981378c a7903adfe8
commit c900dc48db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,8 +81,9 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
if ig.Spec.SecurityGroupOverride != nil {
glog.V(1).Infof("WARNING: You are overwriting the Instance Groups, Security Group. When this is done you are responsible for ensure the correct rules!")
sgName := fmt.Sprintf("%v-%v", fi.StringValue(ig.Spec.SecurityGroupOverride), ig.Spec.Role)
sgLink = &awstasks.SecurityGroup{
Name: ig.Spec.SecurityGroupOverride,
Name: &sgName,
ID: ig.Spec.SecurityGroupOverride,
Shared: fi.Bool(true),
}

3
pkg/model/firewall.go
View File

@ -483,8 +483,9 @@ func (b *KopsModelContext) GetSecurityGroups(role kops.InstanceGroupRole) ([]Sec
}
done[name] = true
sgName := fmt.Sprintf("%v-%v", fi.StringValue(ig.Spec.SecurityGroupOverride), role)
t := &awstasks.SecurityGroup{
Name: ig.Spec.SecurityGroupOverride,
Name: &sgName,
ID: ig.Spec.SecurityGroupOverride,
VPC: b.LinkToVPC(),
Shared: fi.Bool(true),