From b52c945f9fca68d2c8685800736e94b7598fe4a3 Mon Sep 17 00:00:00 2001
From: Thanabodee Charoenpiriyakij <wingyminus@gmail.com>
Date: Fri, 10 Aug 2018 17:55:44 +0700
Subject: [PATCH] Apply cloud labels into ELB

Fixes #2048
---
 tests/integration/update_cluster/complex/kubernetes.tf | 2 ++
 upup/pkg/fi/cloudup/utils.go                           | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf
index 492edee0ae..4525ec945a 100644
--- 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
index 80cf8dc856..728d4c340c 100644
--- 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 {