Revert "Apply cloud labels into ELB"

This reverts commit b52c945.
rayh · Sep 25, 2018 · 2fc634c · 2fc634c
1 parent 5ce8301
commit 2fc634c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf
@@ -228,8 +228,6 @@ 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,9 +80,6 @@ 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 {