Add PVC and PV metadata as tags to EFS access points

kubernetes-sigs · Mar 10, 2021 · 74e1e4e · 74e1e4e
1 parent be9eddc
commit 74e1e4e
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 12 deletions.
diff --git a/charts/aws-efs-csi-driver/templates/controller.yaml b/charts/aws-efs-csi-driver/templates/controller.yaml
@@ -81,6 +81,7 @@ spec:
             - --v=5
             - --feature-gates=Topology=true
             - --leader-election
+            - --extra-create-metadata
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml
@@ -56,12 +56,13 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: csi-provisioner
-          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4
           args:
             - --csi-address=$(ADDRESS)
             - --v=5
             - --feature-gates=Topology=true
             - --leader-election
+            - --extra-create-metadata
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/pkg/cloud/cloud.go b/pkg/cloud/cloud.go
@@ -63,6 +63,7 @@ type AccessPointOptions struct {
 	Gid            int64
 	DirectoryPerms string
 	DirectoryPath  string
+	Tags           map[string]string
 }
 
 // Efs abstracts efs client(https://docs.aws.amazon.com/sdk-for-go/api/service/efs/)
@@ -109,6 +110,7 @@ func (c *cloud) GetMetadata() MetadataService {
 }
 
 func (c *cloud) CreateAccessPoint(ctx context.Context, volumeName string, accessPointOpts *AccessPointOptions) (accessPoint *AccessPoint, err error) {
+	efsTags := parseEfsTags(accessPointOpts.Tags)
 	createAPInput := &efs.CreateAccessPointInput{
 		ClientToken:  &volumeName,
 		FileSystemId: &accessPointOpts.FileSystemId,
@@ -124,6 +126,7 @@ func (c *cloud) CreateAccessPoint(ctx context.Context, volumeName string, access
 			},
 			Path: &accessPointOpts.DirectoryPath,
 		},
+		Tags: efsTags,
 	}
 
 	klog.V(5).Infof("Calling Create AP with input: %+v", *createAPInput)
@@ -234,3 +237,15 @@ func isAccessDenied(err error) bool {
 	}
 	return false
 }
+func parseEfsTags(tagMap map[string]string) []*efs.Tag {
+	efsTags := []*efs.Tag{}
+	for k, v := range tagMap {
+		key := k
+		value := v
+		efsTags = append(efsTags, &efs.Tag{
+			Key:   &key,
+			Value: &value,
+		})
+	}
+	return efsTags
+}
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -31,17 +31,20 @@ import (
 )
 
 const (
-	AccessPointMode     = "efs-ap"
-	FsId                = "fileSystemId"
-	GidMin              = "gidRangeStart"
-	GidMax              = "gidRangeEnd"
-	DirectoryPerms      = "directoryPerms"
-	BasePath            = "basePath"
-	ProvisioningMode    = "provisioningMode"
-	DefaultGidMin       = 50000
-	DefaultGidMax       = 7000000
-	RootDirPrefix       = "efs-csi-ap"
-	TempMountPathPrefix = "/var/lib/csi/pv"
+	AccessPointMode       = "efs-ap"
+	FsId                  = "fileSystemId"
+	GidMin                = "gidRangeStart"
+	GidMax                = "gidRangeEnd"
+	DirectoryPerms        = "directoryPerms"
+	BasePath              = "basePath"
+	ProvisioningMode      = "provisioningMode"
+	DefaultGidMin         = 50000
+	DefaultGidMax         = 7000000
+	RootDirPrefix         = "efs-csi-ap"
+	TempMountPathPrefix   = "/var/lib/csi/pv"
+	PVCNameParameter      = "csi.storage.k8s.io/pvc/name"
+	PVCNameSpaceParameter = "csi.storage.k8s.io/pvc/namespace"
+	PVNameParameter       = "csi.storage.k8s.io/pv/name"
 )
 
 var (
@@ -77,6 +80,9 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		basePath         string
 		provisioningMode string
 		err              error
+		pvcName          string
+		pvcNamespace     string
+		pvName           string
 	)
 
 	//Parse parameters
@@ -92,8 +98,19 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		return nil, status.Errorf(codes.InvalidArgument, "Missing %v parameter", ProvisioningMode)
 	}
 
+	if value, ok := volumeParams[PVCNameParameter]; ok {
+		pvcName = value
+	}
+	if value, ok := volumeParams[PVCNameSpaceParameter]; ok {
+		pvcNamespace = value
+	}
+	if value, ok := volumeParams[PVNameParameter]; ok {
+		pvName = value
+	}
+	tags := map[string]string{PVCNameSpaceParameter: pvcNamespace, PVCNameParameter: pvcName, PVNameParameter: pvName}
 	accessPointsOptions := &cloud.AccessPointOptions{
 		CapacityGiB: volSize,
+		Tags: tags,
 	}
 
 	if value, ok := volumeParams[FsId]; ok {