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

Merge pull request #4784 from justinsb/always_tag_volumes 

Make sure volumes are tagged
This commit is contained in:
k8s-ci-robot 2018-03-24 23:32:00 -07:00 committed by GitHub
parent e65b9e3a2a 0ce7dbf4bd
commit 63225eb674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 207 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/model/master_volumes.go
View File

@ -130,6 +130,9 @@ func (b *MasterVolumeBuilder) addAWSVolume(c *fi.ModelBuilderContext, name strin
// This says "only mount on a master"
tags[awsup.TagNameRolePrefix+"master"] = "1"
// We always add an owned tags (these can't be shared)
tags["kubernetes.io/cluster/"+b.Cluster.ObjectMeta.Name] = "owned"
encrypted := fi.BoolValue(m.EncryptedVolume)
t := &awstasks.EBSVolume{

8
tests/integration/update_cluster/additional_user-data/cloudformation.json
View File

@ -550,6 +550,10 @@
{
"Key": "k8s.io/role/master",
"Value": "1"
},
{
"Key": "kubernetes.io/cluster/additionaluserdata.example.com",
"Value": "owned"
}
]
}
@ -577,6 +581,10 @@
{
"Key": "k8s.io/role/master",
"Value": "1"
},
{
"Key": "kubernetes.io/cluster/additionaluserdata.example.com",
"Value": "owned"
}
]
}

18
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -158,10 +158,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-bastionuserdata-example-com" {
encrypted = false
tags = {
KubernetesCluster = "bastionuserdata.example.com"
Name = "us-test-1a.etcd-events.bastionuserdata.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "bastionuserdata.example.com"
Name = "us-test-1a.etcd-events.bastionuserdata.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
@ -172,10 +173,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-bastionuserdata-example-com" {
encrypted = false
tags = {
KubernetesCluster = "bastionuserdata.example.com"
Name = "us-test-1a.etcd-main.bastionuserdata.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "bastionuserdata.example.com"
Name = "us-test-1a.etcd-main.bastionuserdata.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}

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

@ -137,12 +137,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-complex-example-com" {
encrypted = false
tags = {
KubernetesCluster = "complex.example.com"
Name = "us-test-1a.etcd-events.complex.example.com"
Owner = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "complex.example.com"
Name = "us-test-1a.etcd-events.complex.example.com"
Owner = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/complex.example.com" = "owned"
}
}
@ -153,12 +154,13 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-complex-example-com" {
encrypted = false
tags = {
KubernetesCluster = "complex.example.com"
Name = "us-test-1a.etcd-main.complex.example.com"
Owner = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "complex.example.com"
Name = "us-test-1a.etcd-main.complex.example.com"
Owner = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/complex.example.com" = "owned"
}
}

54
tests/integration/update_cluster/ha/kubernetes.tf
View File

@ -165,10 +165,11 @@ resource "aws_ebs_volume" "a-etcd-events-ha-example-com" {
encrypted = false
tags = {
KubernetesCluster = "ha.example.com"
Name = "a.etcd-events.ha.example.com"
"k8s.io/etcd/events" = "a/a,b,c"
"k8s.io/role/master" = "1"
KubernetesCluster = "ha.example.com"
Name = "a.etcd-events.ha.example.com"
"k8s.io/etcd/events" = "a/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}
@ -179,10 +180,11 @@ resource "aws_ebs_volume" "a-etcd-main-ha-example-com" {
encrypted = false
tags = {
KubernetesCluster = "ha.example.com"
Name = "a.etcd-main.ha.example.com"
"k8s.io/etcd/main" = "a/a,b,c"
"k8s.io/role/master" = "1"
KubernetesCluster = "ha.example.com"
Name = "a.etcd-main.ha.example.com"
"k8s.io/etcd/main" = "a/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}
@ -193,10 +195,11 @@ resource "aws_ebs_volume" "b-etcd-events-ha-example-com" {
encrypted = false
tags = {
KubernetesCluster = "ha.example.com"
Name = "b.etcd-events.ha.example.com"
"k8s.io/etcd/events" = "b/a,b,c"
"k8s.io/role/master" = "1"
KubernetesCluster = "ha.example.com"
Name = "b.etcd-events.ha.example.com"
"k8s.io/etcd/events" = "b/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}
@ -207,10 +210,11 @@ resource "aws_ebs_volume" "b-etcd-main-ha-example-com" {
encrypted = false
tags = {
KubernetesCluster = "ha.example.com"
Name = "b.etcd-main.ha.example.com"
"k8s.io/etcd/main" = "b/a,b,c"
"k8s.io/role/master" = "1"
KubernetesCluster = "ha.example.com"
Name = "b.etcd-main.ha.example.com"
"k8s.io/etcd/main" = "b/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}
@ -221,10 +225,11 @@ resource "aws_ebs_volume" "c-etcd-events-ha-example-com" {
encrypted = false
tags = {
KubernetesCluster = "ha.example.com"
Name = "c.etcd-events.ha.example.com"
"k8s.io/etcd/events" = "c/a,b,c"
"k8s.io/role/master" = "1"
KubernetesCluster = "ha.example.com"
Name = "c.etcd-events.ha.example.com"
"k8s.io/etcd/events" = "c/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}
@ -235,10 +240,11 @@ resource "aws_ebs_volume" "c-etcd-main-ha-example-com" {
encrypted = false
tags = {
KubernetesCluster = "ha.example.com"
Name = "c.etcd-main.ha.example.com"
"k8s.io/etcd/main" = "c/a,b,c"
"k8s.io/role/master" = "1"
KubernetesCluster = "ha.example.com"
Name = "c.etcd-main.ha.example.com"
"k8s.io/etcd/main" = "c/a,b,c"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/ha.example.com" = "owned"
}
}

18
tests/integration/update_cluster/minimal-141/kubernetes.tf
View File

@ -107,10 +107,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-minimal-141-example-com" {
encrypted = false
tags = {
KubernetesCluster = "minimal-141.example.com"
Name = "us-test-1a.etcd-events.minimal-141.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "minimal-141.example.com"
Name = "us-test-1a.etcd-events.minimal-141.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/minimal-141.example.com" = "owned"
}
}
@ -121,10 +122,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-141-example-com" {
encrypted = false
tags = {
KubernetesCluster = "minimal-141.example.com"
Name = "us-test-1a.etcd-main.minimal-141.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "minimal-141.example.com"
Name = "us-test-1a.etcd-main.minimal-141.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/minimal-141.example.com" = "owned"
}
}

8
tests/integration/update_cluster/minimal-cloudformation/cloudformation.json
View File

@ -550,6 +550,10 @@
{
"Key": "k8s.io/role/master",
"Value": "1"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"
}
]
}
@ -577,6 +581,10 @@
{
"Key": "k8s.io/role/master",
"Value": "1"
},
{
"Key": "kubernetes.io/cluster/minimal.example.com",
"Value": "owned"
}
]
}

18
tests/integration/update_cluster/minimal/kubernetes.tf
View File

@ -107,10 +107,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-minimal-example-com" {
encrypted = false
tags = {
KubernetesCluster = "minimal.example.com"
Name = "us-test-1a.etcd-events.minimal.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "minimal.example.com"
Name = "us-test-1a.etcd-events.minimal.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/minimal.example.com" = "owned"
}
}
@ -121,10 +122,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-minimal-example-com" {
encrypted = false
tags = {
KubernetesCluster = "minimal.example.com"
Name = "us-test-1a.etcd-main.minimal.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "minimal.example.com"
Name = "us-test-1a.etcd-main.minimal.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/minimal.example.com" = "owned"
}
}

18
tests/integration/update_cluster/private-shared-subnet/kubernetes.tf
View File

@ -162,10 +162,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-private-shared-subnet-example-
encrypted = false
tags = {
KubernetesCluster = "private-shared-subnet.example.com"
Name = "us-test-1a.etcd-events.private-shared-subnet.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "private-shared-subnet.example.com"
Name = "us-test-1a.etcd-events.private-shared-subnet.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
}
}
@ -176,10 +177,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-private-shared-subnet-example-co
encrypted = false
tags = {
KubernetesCluster = "private-shared-subnet.example.com"
Name = "us-test-1a.etcd-main.private-shared-subnet.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "private-shared-subnet.example.com"
Name = "us-test-1a.etcd-main.private-shared-subnet.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
}
}

18
tests/integration/update_cluster/privatecalico/kubernetes.tf
View File

@ -158,10 +158,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecalico-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatecalico.example.com"
Name = "us-test-1a.etcd-events.privatecalico.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatecalico.example.com"
Name = "us-test-1a.etcd-events.privatecalico.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}
@ -172,10 +173,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecalico-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatecalico.example.com"
Name = "us-test-1a.etcd-main.privatecalico.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatecalico.example.com"
Name = "us-test-1a.etcd-main.privatecalico.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}

18
tests/integration/update_cluster/privatecanal/kubernetes.tf
View File

@ -158,10 +158,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatecanal-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatecanal.example.com"
Name = "us-test-1a.etcd-events.privatecanal.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatecanal.example.com"
Name = "us-test-1a.etcd-events.privatecanal.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}
@ -172,10 +173,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatecanal-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatecanal.example.com"
Name = "us-test-1a.etcd-main.privatecanal.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatecanal.example.com"
Name = "us-test-1a.etcd-main.privatecanal.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}

18
tests/integration/update_cluster/privatedns1/kubernetes.tf
View File

@ -158,10 +158,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatedns1-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatedns1.example.com"
Name = "us-test-1a.etcd-events.privatedns1.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatedns1.example.com"
Name = "us-test-1a.etcd-events.privatedns1.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}
@ -172,10 +173,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns1-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatedns1.example.com"
Name = "us-test-1a.etcd-main.privatedns1.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatedns1.example.com"
Name = "us-test-1a.etcd-main.privatedns1.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}

18
tests/integration/update_cluster/privatedns2/kubernetes.tf
View File

@ -158,10 +158,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatedns2-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatedns2.example.com"
Name = "us-test-1a.etcd-events.privatedns2.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatedns2.example.com"
Name = "us-test-1a.etcd-events.privatedns2.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
}
}
@ -172,10 +173,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatedns2-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatedns2.example.com"
Name = "us-test-1a.etcd-main.privatedns2.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatedns2.example.com"
Name = "us-test-1a.etcd-main.privatedns2.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
}
}

18
tests/integration/update_cluster/privateflannel/kubernetes.tf
View File

@ -158,10 +158,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privateflannel-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privateflannel.example.com"
Name = "us-test-1a.etcd-events.privateflannel.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privateflannel.example.com"
Name = "us-test-1a.etcd-events.privateflannel.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}
@ -172,10 +173,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privateflannel-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privateflannel.example.com"
Name = "us-test-1a.etcd-main.privateflannel.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privateflannel.example.com"
Name = "us-test-1a.etcd-main.privateflannel.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}

18
tests/integration/update_cluster/privatekopeio/kubernetes.tf
View File

@ -158,10 +158,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privatekopeio-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatekopeio.example.com"
Name = "us-test-1a.etcd-events.privatekopeio.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatekopeio.example.com"
Name = "us-test-1a.etcd-events.privatekopeio.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}
@ -172,10 +173,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privatekopeio-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privatekopeio.example.com"
Name = "us-test-1a.etcd-main.privatekopeio.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privatekopeio.example.com"
Name = "us-test-1a.etcd-main.privatekopeio.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}

18
tests/integration/update_cluster/privateweave/kubernetes.tf
View File

@ -158,10 +158,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-privateweave-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "us-test-1a.etcd-events.privateweave.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privateweave.example.com"
Name = "us-test-1a.etcd-events.privateweave.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}
@ -172,10 +173,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-privateweave-example-com" {
encrypted = false
tags = {
KubernetesCluster = "privateweave.example.com"
Name = "us-test-1a.etcd-main.privateweave.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "privateweave.example.com"
Name = "us-test-1a.etcd-main.privateweave.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}

18
tests/integration/update_cluster/shared_subnet/kubernetes.tf
View File

@ -111,10 +111,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-sharedsubnet-example-com" {
encrypted = false
tags = {
KubernetesCluster = "sharedsubnet.example.com"
Name = "us-test-1a.etcd-events.sharedsubnet.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "sharedsubnet.example.com"
Name = "us-test-1a.etcd-events.sharedsubnet.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/sharedsubnet.example.com" = "owned"
}
}
@ -125,10 +126,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-sharedsubnet-example-com" {
encrypted = false
tags = {
KubernetesCluster = "sharedsubnet.example.com"
Name = "us-test-1a.etcd-main.sharedsubnet.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "sharedsubnet.example.com"
Name = "us-test-1a.etcd-main.sharedsubnet.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/sharedsubnet.example.com" = "owned"
}
}

18
tests/integration/update_cluster/shared_vpc/kubernetes.tf
View File

@ -107,10 +107,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-events-sharedvpc-example-com" {
encrypted = false
tags = {
KubernetesCluster = "sharedvpc.example.com"
Name = "us-test-1a.etcd-events.sharedvpc.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "sharedvpc.example.com"
Name = "us-test-1a.etcd-events.sharedvpc.example.com"
"k8s.io/etcd/events" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/sharedvpc.example.com" = "owned"
}
}
@ -121,10 +122,11 @@ resource "aws_ebs_volume" "us-test-1a-etcd-main-sharedvpc-example-com" {
encrypted = false
tags = {
KubernetesCluster = "sharedvpc.example.com"
Name = "us-test-1a.etcd-main.sharedvpc.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
KubernetesCluster = "sharedvpc.example.com"
Name = "us-test-1a.etcd-main.sharedvpc.example.com"
"k8s.io/etcd/main" = "us-test-1a/us-test-1a"
"k8s.io/role/master" = "1"
"kubernetes.io/cluster/sharedvpc.example.com" = "owned"
}
}

14
upup/pkg/fi/cloudup/awstasks/ebsvolume.go
View File

@ -19,6 +19,7 @@ package awstasks
import (
"fmt"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/golang/glog"
"k8s.io/kops/upup/pkg/fi"
@ -141,6 +142,19 @@ func (_ *EBSVolume) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *EBSVolume) e
Encrypted: e.Encrypted,
}
if len(e.Tags) != 0 {
request.TagSpecifications = []*ec2.TagSpecification{
{ResourceType: aws.String(ec2.ResourceTypeVolume)},
}
for k, v := range e.Tags {
request.TagSpecifications[0].Tags = append(request.TagSpecifications[0].Tags, &ec2.Tag{
Key: aws.String(k),
Value: aws.String(v),
})
}
}
response, err := t.Cloud.EC2().CreateVolume(request)
if err != nil {
return fmt.Errorf("error creating PersistentVolume: %v", err)