Merge pull request #1274 from MetisMachine/aws-new

AWS: Inclue zone in volume ID

changelogs/unreleased/1274-tsturzl

@@ -0,0 +1 @@
+AWS EBS Volume IDs now contain AZ

pkg/cloudprovider/aws/block_store.go

@@ -17,6 +17,7 @@ limitations under the License.
 package aws
 
 import (
+	"fmt"
 	"os"
 	"regexp"
 	"strings"
@@ -282,7 +283,13 @@ func (b *blockStore) SetVolumeID(unstructuredPV runtime.Unstructured, volumeID s
 		return nil, errors.New("spec.awsElasticBlockStore not found")
 	}
 
-	pv.Spec.AWSElasticBlockStore.VolumeID = volumeID
+	pvFailureDomainZone := pv.Labels["failure-domain.beta.kubernetes.io/zone"]
+
+	if len(pvFailureDomainZone) > 0 {
+		pv.Spec.AWSElasticBlockStore.VolumeID = fmt.Sprintf("aws://%s/%s", pvFailureDomainZone, volumeID)
+	} else {
+		pv.Spec.AWSElasticBlockStore.VolumeID = volumeID
+	}
 
 	res, err := runtime.DefaultUnstructuredConverter.ToUnstructured(pv)
 	if err != nil {

pkg/cloudprovider/aws/block_store_test.go

@@ -85,7 +85,44 @@ func TestSetVolumeID(t *testing.T) {
 	pv.Object["spec"] = map[string]interface{}{
 		"awsElasticBlockStore": aws,
 	}
+
+	labels := map[string]interface{}{
+		"failure-domain.beta.kubernetes.io/zone": "us-east-1a",
+	}
+
+	pv.Object["metadata"] = map[string]interface{}{
+		"labels": labels,
+	}
+
 	updatedPV, err = b.SetVolumeID(pv, "vol-updated")
+
+	require.NoError(t, err)
+
+	res := new(v1.PersistentVolume)
+	require.NoError(t, runtime.DefaultUnstructuredConverter.FromUnstructured(updatedPV.UnstructuredContent(), res))
+	require.NotNil(t, res.Spec.AWSElasticBlockStore)
+	assert.Equal(t, "aws://us-east-1a/vol-updated", res.Spec.AWSElasticBlockStore.VolumeID)
+}
+
+func TestSetVolumeIDNoZone(t *testing.T) {
+	b := &blockStore{}
+
+	pv := &unstructured.Unstructured{
+		Object: map[string]interface{}{},
+	}
+
+	// missing spec.awsElasticBlockStore -> error
+	updatedPV, err := b.SetVolumeID(pv, "vol-updated")
+	require.Error(t, err)
+
+	// happy path
+	aws := map[string]interface{}{}
+	pv.Object["spec"] = map[string]interface{}{
+		"awsElasticBlockStore": aws,
+	}
+
+	updatedPV, err = b.SetVolumeID(pv, "vol-updated")
+
 	require.NoError(t, err)
 
 	res := new(v1.PersistentVolume)