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

Merge pull request #5593 from wingyplus/elb_cloud_labels 

Apply cloud labels into ELB
This commit is contained in:
k8s-ci-robot 2018-08-18 02:00:01 -07:00 committed by GitHub
parent 0502410112 b52c945f9f
commit c61fb537ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/update_cluster/complex/kubernetes.tf
View File

@ -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"
}
}

3
upup/pkg/fi/cloudup/utils.go
View File

@ -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 {