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

2048 - Add cloudLabels as tags to API ELB resource

This commit is contained in:
ryan-dyer 2019-03-20 09:00:05 -05:00
parent 4a57f8fb2d
commit fd2ed53f79
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,8 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error {
ConnectionSettings: &awstasks.LoadBalancerConnectionSettings{
IdleTimeout: fi.Int64(int64(idleTimeout.Seconds())),
},
Tags: b.Cluster.Spec.CloudLabels,
}
switch lbSpec.Type {

12
upup/pkg/fi/cloudup/awstasks/load_balancer.go
View File

@ -64,6 +64,8 @@ type LoadBalancer struct {
ConnectionSettings *LoadBalancerConnectionSettings
CrossZoneLoadBalancing *LoadBalancerCrossZoneLoadBalancing
SSLCertificateID string
Tags map[string]string
}
var _ fi.CompareWithID = &LoadBalancer{}
@ -601,6 +603,10 @@ func (_ *LoadBalancer) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *LoadBalan
}
}
if err := t.AddELBTags(loadBalancerName, e.Tags); err != nil {
return err
}
if err := t.AddELBTags(loadBalancerName, t.Cloud.BuildTags(e.Name)); err != nil {
return err
}
@ -749,7 +755,11 @@ func (_ *LoadBalancer) RenderTerraform(t *terraform.TerraformTarget, a, e, chang
tf.CrossZoneLoadBalancing = e.CrossZoneLoadBalancing.Enabled
}
tf.Tags = cloud.BuildTags(e.Name)
var tags map[string]string = cloud.BuildTags(e.Name)
for k, v := range e.Tags {
tags[k] = v
}
tf.Tags = tags
return t.RenderResource("aws_elb", *e.Name, tf)
}