public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-17 16:56:00 +02:00
Code Issues Projects Releases Wiki Activity

Finalizing ebs migration.

Browse Source
This commit is contained in:
Jan Mußler
2020-12-09 15:18:15 +01:00
parent 88aab59332
commit 7a89a7c39f
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/volumes.go
+1 -1
View File
@@ -267,7 +267,7 @@ func (c *Cluster) executeEBSMigration() error {
volumeIds := []string{}
var volumeID string
for _, pv := range pvs {
volumeID, err = c.VolumeResizer.GetProviderVolumeID(pv)
volumeID, err = c.VolumeResizer.ExtractVolumeID(pv.Spec.AWSElasticBlockStore.VolumeID)
if err != nil {
continue
}
pkg/cluster/volumes_test.go
+4
View File
@@ -289,6 +289,10 @@ func TestMigrateEBS(t *testing.T) {
defer ctrl.Finish()
resizer := mocks.NewMockVolumeResizer(ctrl)
resizer.EXPECT().ExtractVolumeID(gomock.Eq("aws://eu-central-1b/ebs-volume-1")).Return("ebs-volume-1", nil)
resizer.EXPECT().ExtractVolumeID(gomock.Eq("aws://eu-central-1b/ebs-volume-2")).Return("ebs-volume-2", nil)
resizer.EXPECT().DescribeVolumes(gomock.Eq([]string{"ebs-volume-1", "ebs-volume-2"})).Return(
[]volumes.VolumeProperties{
{VolumeID: "ebs-volume-1", VolumeType: "gp2", Size: 100},