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

Merge pull request #8079 from vvbogdanov87/fix-shared-volume-removal 

Set shared field for volume resource on delete
This commit is contained in:
Kubernetes Prow Robot 2019-12-28 11:35:39 -08:00 committed by GitHub
parent f6681d8df5 1b6ae9cb88
commit f57c09b279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/resources/aws/aws.go
View File

@ -606,6 +606,7 @@ func ListVolumes(cloud fi.Cloud, clusterName string) ([]*resources.Resource, err
ID: id,
Type: "volume",
Deleter: DeleteVolume,
Shared: HasSharedTag(ec2.ResourceTypeVolume+":"+id, volume.Tags, clusterName),
}
var blocks []string

55
pkg/resources/aws/aws_test.go
View File

@ -141,3 +141,58 @@ func TestListRouteTables(t *testing.T) {
}
}
}
func TestSharedVolume(t *testing.T) {
cloud := awsup.BuildMockAWSCloud("us-east-1", "abc")
clusterName := "me.example.com"
ownershipTagKey := "kubernetes.io/cluster/" + clusterName
c := &mockec2.MockEC2{}
cloud.MockEC2 = c
sharedVolume, err := c.CreateVolume(&ec2.CreateVolumeInput{
TagSpecifications: []*ec2.TagSpecification{
{
Tags: []*ec2.Tag{
{
Key: aws.String(ownershipTagKey),
Value: aws.String("shared"),
},
},
},
},
})
if err != nil {
t.Fatalf("error creating volume: %v", err)
}
ownedVolume, err := c.CreateVolume(&ec2.CreateVolumeInput{
TagSpecifications: []*ec2.TagSpecification{
{
Tags: []*ec2.Tag{
{
Key: aws.String(ownershipTagKey),
Value: aws.String("owned"),
},
},
},
},
})
if err != nil {
t.Fatalf("error creating volume: %v", err)
}
resourceTrackers, err := ListVolumes(cloud, clusterName)
if err != nil {
t.Fatalf("error listing volumes: %v", err)
}
t.Log(len(resourceTrackers))
for _, rt := range resourceTrackers {
if rt.ID == *sharedVolume.VolumeId && !rt.Shared {
t.Fatalf("expected Shared: true, got: %v", rt.Shared)
}
if rt.ID == *ownedVolume.VolumeId && rt.Shared {
t.Fatalf("expected Shared: false, got: %v", rt.Shared)
}
}
}