Merge pull request #1195 from rimaulana/master

Added Fargate support in the EFS CSI Controller

Author: k8s-ci-robot

pkg/cloud/k8s_metadata.go

@@ -44,7 +44,7 @@ func (k kubernetesApiMetadataProvider) getMetadata() (MetadataService, error) {
 		return nil, fmt.Errorf("node providerID empty, cannot parse")
 	}
 
-	re := regexp.MustCompile("i-[a-z0-9]+$")
+	re := regexp.MustCompile("i-[a-z0-9]+$|[a-z0-9]{32}")
 	instanceID := re.FindString(providerId)
 	if instanceID == "" {
 		return nil, fmt.Errorf("did not find aws instance ID in node providerID string")

pkg/cloud/k8s_metadata_test.go

@@ -78,6 +78,20 @@ func TestInstanceIdParsedFromProviderIdCorrectly(t *testing.T) {
 	}
 }
 
+func TestTaskIdParsedFromProviderIdCorrectly(t *testing.T) {
+	clientSet := setupKubernetesClient(t, nodeName, createFargateNode())
+	k8sMp := kubernetesApiMetadataProvider{api: clientSet}
+
+	metadata, err := k8sMp.getMetadata()
+
+	if err != nil {
+		t.Fatalf("Error occurred when parsing instance ID, %v", err)
+	}
+	if metadata.GetInstanceID() != taskId {
+		t.Fatalf("Instance ID not extracted correctly, expected %s, got %s", taskId, metadata.GetInstanceID())
+	}
+}
+
 func TestRegionAndZoneExtractedCorrectlyFromLabels(t *testing.T) {
 	clientSet := setupKubernetesClient(t, nodeName, createDefaultNode())
 	k8sMp := kubernetesApiMetadataProvider{api: clientSet}
@@ -123,3 +137,7 @@ func createNode(nodeName string, nodeRegion string, nodeZone string, providerId
 func createDefaultNode() *v1.Node {
 	return createNode(nodeName, nodeRegion, nodeZone, fmt.Sprintf("aws:///%s/%s", nodeZone, instanceId))
 }
+
+func createFargateNode() *v1.Node {
+	return createNode(nodeName, nodeRegion, nodeZone, fmt.Sprintf("aws:///%s/1234567890-%s/%s", nodeZone, taskId, nodeName))
+}