Merge pull request #1699 from zmaguire/release-2.1

Release 2.1

Author: dankova22

Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM public.ecr.aws/eks-distro-build-tooling/golang:1.24.0 as go-builder
+FROM public.ecr.aws/eks-distro-build-tooling/golang:1.25.0 as go-builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-efs-csi-driver
 
 ARG TARGETOS

charts/aws-efs-csi-driver/values.yaml

@@ -17,26 +17,26 @@ image:
 sidecars:
   livenessProbe:
     image:
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
-      tag: v2.15.0-eks-1-33-3
+      repository: public.ecr.aws/csi-components/livenessprobe
+      tag: v2.16.0-eksbuild.5
       pullPolicy: IfNotPresent
     resources: {}
     securityContext:
       readOnlyRootFilesystem: true
       allowPrivilegeEscalation: false
   nodeDriverRegistrar:
     image:
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
-      tag: v2.13.0-eks-1-33-3
+      repository: public.ecr.aws/csi-components/csi-node-driver-registrar
+      tag: v2.14.0-eksbuild.5
       pullPolicy: IfNotPresent
     resources: {}
     securityContext:
       readOnlyRootFilesystem: true
       allowPrivilegeEscalation: false
   csiProvisioner:
     image:
-      repository: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
-      tag: v5.2.0-eks-1-33-3
+      repository: public.ecr.aws/csi-components/csi-provisioner
+      tag: v5.3.0-eksbuild.4
       pullPolicy: IfNotPresent
     resources: {}
     securityContext:

deploy/kubernetes/base/controller-deployment.yaml

@@ -69,7 +69,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: csi-provisioner
-          image: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v5.2.0-eks-1-33-3
+          image: public.ecr.aws/csi-components/csi-provisioner:v5.3.0-eksbuild.4
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)
@@ -87,7 +87,7 @@ spec:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
         - name: liveness-probe
-          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.15.0-eks-1-33-3
+          image: public.ecr.aws/csi-components/livenessprobe:v2.16.0-eksbuild.5
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=/csi/csi.sock

deploy/kubernetes/base/node-daemonset.yaml

@@ -91,7 +91,7 @@ spec:
             periodSeconds: 2
             failureThreshold: 5
         - name: csi-driver-registrar
-          image: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.13.0-eks-1-33-3
+          image: public.ecr.aws/csi-components/csi-node-driver-registrar:v2.14.0-eksbuild.5
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=$(ADDRESS)
@@ -115,7 +115,7 @@ spec:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
         - name: liveness-probe
-          image: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.15.0-eks-1-33-3
+          image: public.ecr.aws/csi-components/livenessprobe:v2.16.0-eksbuild.5
           imagePullPolicy: IfNotPresent
           args:
             - --csi-address=/csi/csi.sock

deploy/kubernetes/overlays/stable/ecr/kustomization.yaml

@@ -5,13 +5,13 @@ bases:
 images:
   - name: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-efs-csi-driver
-    newTag: v2.1.10
-  - name: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
+    newTag: v2.1.11
+  - name: public.ecr.aws/csi-components/livenessprobe
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/livenessprobe
-    newTag: v2.15.0-eks-1-33-3
-  - name: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
+    newTag: v2.16.0-eksbuild.5
+  - name: public.ecr.aws/csi-components/csi-node-driver-registrar
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-node-driver-registrar
-    newTag: v2.13.0-eks-1-33-3
-  - name: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
+    newTag: v2.14.0-eksbuild.5
+  - name: public.ecr.aws/csi-components/csi-provisioner
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-provisioner
-    newTag: v5.2.0-eks-1-33-3
+    newTag: v5.3.0-eksbuild.4

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -4,10 +4,10 @@ bases:
   - ../../base
 images:
   - name: public.ecr.aws/efs-csi-driver/amazon/aws-efs-csi-driver
-    newTag: v2.1.10
-  - name: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
-    newTag: v2.15.0-eks-1-33-3
-  - name: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
-    newTag: v2.13.0-eks-1-33-3
-  - name: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
-    newTag: v5.2.0-eks-1-33-3
+    newTag: v2.1.11
+  - name: public.ecr.aws/csi-components/livenessprobe
+    newTag: v2.16.0-eksbuild.5
+  - name: public.ecr.aws/csi-components/csi-node-driver-registrar
+    newTag: v2.14.0-eksbuild.5
+  - name: public.ecr.aws/csi-components/csi-provisioner
+    newTag: v5.3.0-eksbuild.4

docs/README.md

@@ -361,11 +361,11 @@ Enabling the vol-metrics-opt-in parameter activates the gathering of inode and d
 
 
 ### Container Arguments for deployment(controller) 
-| Parameters                  | Values | Default | Optional | Description                                                                                                                                                                                                                            |
-|-----------------------------|--------|---------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| delete-access-point-root-dir|        | false  | true     | Opt in to delete access point root directory by DeleteVolume. By default, DeleteVolume will delete the access point behind Persistent Volume and deleting access point will not delete the access point root directory or its contents. |
-| adaptive-retry-mode         |        | true   | true     | Opt out to use standard sdk retry mode for EFS API calls. By default, Driver will use adaptive mode for the sdk retry configuration which heavily rate limits EFS API requests to reduce throttling if throttling is observed.           |
-| tags                         |       |         | true     | Space separated key:value pairs which will be added as tags for Amazon EFS resources. For example, '--tags=name:efs-tag-test date:Jan24'                                                                                               |
+| Parameters                  | Values | Default | Optional | Description                                                                                                                                                                                                                                                   |
+|-----------------------------|--------|---------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| delete-access-point-root-dir|        | false  | true     | Opt in to delete access point root directory by DeleteVolume. By default, DeleteVolume will delete the access point behind Persistent Volume and deleting access point will not delete the access point root directory or its contents.                       |
+| adaptive-retry-mode         |        | true   | true     | Opt out to use standard sdk retry mode for EFS API calls. By default, Driver will use adaptive mode for the sdk retry configuration which heavily rate limits EFS API requests to reduce throttling if throttling is observed.                                |
+| tags                         |       |         | true     | Space separated key:value pairs which will be added as tags for Amazon EFS resources. For example, '--tags=name:efs-tag-test date:Jan24'. To include a ':' in the tag name or value, use \ as an escape character, for example '--tags="tag\:name:tag\:value" |
 ### Upgrading the Amazon EFS CSI Driver
 
 

go.mod

@@ -154,6 +154,4 @@ require (
 
 replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.2
 
-go 1.24.0
-
-toolchain go1.24.4
+go 1.25.0

pkg/driver/controller_test.go

@@ -796,7 +796,11 @@ func TestCreateVolume(t *testing.T) {
 					cloud:        mockCloud,
 					gidAllocator: NewGidAllocator(),
 					lockManager:  NewLockManagerMap(),
-					tags:         parseTagsFromStr("cluster:efs"),
+					tags:         parseTagsFromStr("cluster:efs tag2\\:name2:tag2\\:val2"),
+				}
+
+				if driver.tags["cluster"] != "efs" || driver.tags["tag2:name2"] != "tag2:val2" {
+					t.Fatalf("Incorrect tags")
 				}
 
 				req := &csi.CreateVolumeRequest{

pkg/driver/driver.go

@@ -23,11 +23,10 @@ import (
 	"time"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"google.golang.org/grpc"
-	"k8s.io/klog/v2"
-
 	"github.com/kubernetes-sigs/aws-efs-csi-driver/pkg/cloud"
 	"github.com/kubernetes-sigs/aws-efs-csi-driver/pkg/util"
+	"google.golang.org/grpc"
+	"k8s.io/klog/v2"
 )
 
 const (
@@ -155,9 +154,31 @@ func parseTagsFromStr(tagStr string) map[string]string {
 		return m
 	}
 	tagsSplit := strings.Split(tagStr, " ")
-	for _, pair := range tagsSplit {
-		p := strings.Split(pair, ":")
-		m[p[0]] = p[1]
+	for _, currTag := range tagsSplit {
+		var nameBuilder strings.Builder
+		var valBuilder strings.Builder
+		var currBuilder *strings.Builder = &nameBuilder
+
+		for i := 0; i < len(currTag); i++ {
+			if currTag[i] == ':' {
+				if currBuilder == &valBuilder {
+					break
+				} else {
+					currBuilder = &valBuilder
+					continue
+				}
+			}
+
+			// Handle escape character
+			if currTag[i] == byte('\\') && currTag[i+1] == byte(':') {
+				currBuilder.WriteRune(':')
+				i++ // Skip an extra character
+				continue
+			}
+
+			currBuilder.WriteByte(currTag[i])
+		}
+		m[nameBuilder.String()] = valBuilder.String()
 	}
 	return m
 }