Merge pull request #5593 from wingyplus/elb_cloud_labels

Apply cloud labels into ELB
kubernetes · Aug 18, 2018 · c61fb53 · c61fb53
2 parents 0502410 + b52c945
commit c61fb53
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf
@@ -228,6 +228,8 @@ resource "aws_elb" "api-complex-example-com" {
   tags = {
     KubernetesCluster = "complex.example.com"
     Name              = "api.complex.example.com"
+    Owner             = "John Doe"
+    "foo/bar"         = "fib+baz"
   }
 }
 

diff --git a/upup/pkg/fi/cloudup/utils.go b/upup/pkg/fi/cloudup/utils.go
@@ -80,6 +80,9 @@ func BuildCloud(cluster *kops.Cluster) (fi.Cloud, error) {
 			}
 
 			cloudTags := map[string]string{awsup.TagClusterName: cluster.ObjectMeta.Name}
+			for k, v := range cluster.Spec.CloudLabels {
+				cloudTags[k] = v
+			}
 
 			awsCloud, err := awsup.NewAWSCloud(region, cloudTags)
 			if err != nil {