diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf index 51e87c74c71f5..0a2b134482d2a 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 80cf8dc8563dc..728d4c340cc4a 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 {