Merge branch 'master' into 150post

charts/aws-ebs-csi-driver/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Helm chart
 
+## v2.4.1
+
+* Replace deprecated arg `--extra-volume-tags` by `--extra-tags`
+
 ## v2.4.0
 
 * Bump app/driver version to `v1.4.0`

charts/aws-ebs-csi-driver/templates/_helpers.tpl

@@ -41,8 +41,12 @@ helm.sh/chart: {{ include "aws-ebs-csi-driver.chart" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
+app.kubernetes.io/component: csi-driver
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
+{{- if .Values.customLabels }}
+{{ toYaml .Values.customLabels }}
+{{- end }}
 {{- end -}}
 
 {{/*
@@ -56,15 +60,15 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
-Convert the `--extra-volume-tags` command line arg from a map.
+Convert the `--extra-tags` command line arg from a map.
 */}}
 {{- define "aws-ebs-csi-driver.extra-volume-tags" -}}
 {{- $result := dict "pairs" (list) -}}
 {{- range $key, $value := .Values.controller.extraVolumeTags -}}
 {{- $noop := printf "%s=%v" $key $value | append $result.pairs | set $result "pairs" -}}
 {{- end -}}
 {{- if gt (len $result.pairs) 0 -}}
-{{- printf "%s=%s" "- --extra-volume-tags" (join "," $result.pairs) -}}
+{{- printf "%s=%s" "- --extra-tags" (join "," $result.pairs) -}}
 {{- end -}}
 {{- end -}}
 

charts/aws-ebs-csi-driver/templates/controller.yaml

@@ -189,7 +189,7 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-        {{- if .Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1" }}
+        {{- if or (.Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1beta1") (.Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1") }}
         - name: csi-snapshotter
           image: {{ printf "%s:%s" .Values.sidecars.snapshotter.image.repository .Values.sidecars.snapshotter.image.tag }}
           imagePullPolicy: {{ default .Values.image.pullPolicy .Values.sidecars.snapshotter.image.pullPolicy }}

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

@@ -8,6 +8,10 @@ image:
   tag: ""
   pullPolicy: IfNotPresent
 
+# -- Custom labels to add into metadata
+customLabels: {}
+  # k8s-app: aws-ebs-csi-driver
+
 sidecars:
   provisioner:
     env: []

cloudbuild.yaml

@@ -1,6 +1,6 @@
 timeout: 3600s
 steps:
-  - name: gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930
+  - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90
     entrypoint: ./hack/prow.sh
     env:
       - GIT_TAG=${_GIT_TAG}

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

@@ -0,0 +1,25 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+bases:
+  - ../ecr
+images:
+  - name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-ebs-csi-driver
+    newName: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver
+  - name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-provisioner
+    newName: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
+    newTag: v2.1.1-eks-1-18-3
+  - name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-attacher
+    newName: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher
+    newTag: v3.1.0-eks-1-18-3
+  - name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/livenessprobe
+    newName: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
+    newTag: v2.2.0-eks-1-18-3
+  - name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-snapshotter
+    newName: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter
+    newTag: v3.0.3-eks-1-18-3
+  - name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-resizer
+    newName: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer
+    newTag: v1.1.0-eks-1-18-3
+  - name: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-node-driver-registrar
+    newName: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
+    newTag: v2.1.0-eks-1-18-3

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

@@ -1,26 +1,20 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
-  - ../../../base
+  - ../gcr
 images:
   - name: k8s.gcr.io/provider-aws/aws-ebs-csi-driver
     newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-ebs-csi-driver
     newTag: v1.5.0
   - name: k8s.gcr.io/sig-storage/csi-provisioner
-    newName: public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner
-    newTag: v2.1.1-eks-1-18-3
+    newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-provisioner
   - name: k8s.gcr.io/sig-storage/csi-attacher
-    newName: public.ecr.aws/eks-distro/kubernetes-csi/external-attacher
-    newTag: v3.1.0-eks-1-18-3
+    newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-attacher
   - name: k8s.gcr.io/sig-storage/livenessprobe
-    newName: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe
-    newTag: v2.2.0-eks-1-18-3
+    newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/livenessprobe
   - name: k8s.gcr.io/sig-storage/csi-snapshotter
-    newName: public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter
-    newTag: v3.0.3-eks-1-18-3
+    newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-snapshotter
   - name: k8s.gcr.io/sig-storage/csi-resizer
-    newName: public.ecr.aws/eks-distro/kubernetes-csi/external-resizer
-    newTag: v1.1.0-eks-1-18-3
+    newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-resizer
   - name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
-    newName: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar
-    newTag: v2.1.0-eks-1-18-3
+    newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-node-driver-registrar

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

@@ -0,0 +1,19 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+bases:
+  - ../../../base
+images:
+  - name: k8s.gcr.io/provider-aws/aws-ebs-csi-driver
+    newTag: v1.4.0
+  - name: k8s.gcr.io/sig-storage/csi-provisioner
+    newTag: v2.1.1
+  - name: k8s.gcr.io/sig-storage/csi-attacher
+    newTag: v3.1.0
+  - name: k8s.gcr.io/sig-storage/livenessprobe
+    newTag: v2.2.0
+  - name: k8s.gcr.io/sig-storage/csi-snapshotter
+    newTag: v3.0.3
+  - name: k8s.gcr.io/sig-storage/csi-resizer
+    newTag: v1.1.0
+  - name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+    newTag: v2.1.0

deploy/kubernetes/overlays/stable/kustomization.yaml

@@ -1,19 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-  - ../../base
-images:
-  - name: k8s.gcr.io/provider-aws/aws-ebs-csi-driver
-    newTag: v1.5.0
-  - name: k8s.gcr.io/sig-storage/csi-provisioner
-    newTag: v2.1.1
-  - name: k8s.gcr.io/sig-storage/csi-attacher
-    newTag: v3.1.0
-  - name: k8s.gcr.io/sig-storage/livenessprobe
-    newTag: v2.2.0
-  - name: k8s.gcr.io/sig-storage/csi-snapshotter
-    newTag: v3.0.3
-  - name: k8s.gcr.io/sig-storage/csi-resizer
-    newTag: v1.1.0
-  - name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
-    newTag: v2.1.0
+resources:
+  - ./ecr-public

pkg/driver/node.go

@@ -22,7 +22,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"strings"
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/cloud"
@@ -308,7 +307,7 @@ func (d *nodeService) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandV
 		// VolumeCapability is nil, check if volumePath point to a block device
 		isBlock, err := d.IsBlockDevice(volumePath)
 		if err != nil {
-			return nil, status.Errorf(codes.Internal, "failed to determine device path for volumePath [%v]: %v", volumePath, err)
+			return nil, status.Errorf(codes.Internal, "failed to determine if volumePath [%v] is a block device: %v", volumePath, err)
 		}
 		if isBlock {
 			// Skip resizing for Block NodeExpandVolume
@@ -321,16 +320,14 @@ func (d *nodeService) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandV
 		}
 	}
 
-	// TODO this won't make sense on Windows with csi-proxy
-	args := []string{"-o", "source", "--noheadings", "--target", volumePath}
-	output, err := d.mounter.(*NodeMounter).Exec.Command("findmnt", args...).Output()
+	deviceName, _, err := d.mounter.GetDeviceNameFromMount(volumePath)
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "Could not determine device path: %v", err)
-
+		return nil, status.Errorf(codes.Internal, "failed to get device name from mount %s: %v", volumePath, err)
 	}
-	devicePath := strings.TrimSpace(string(output))
-	if len(devicePath) == 0 {
-		return nil, status.Errorf(codes.Internal, "Could not get valid device for mount path: %q", req.GetVolumePath())
+
+	devicePath, err := d.findDevicePath(deviceName, volumeID, "")
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "failed to find device path for device name %s for mount %s: %v", deviceName, req.GetVolumePath(), err)
 	}
 
 	r := mountutils.NewResizeFs(d.mounter.(*NodeMounter).Exec)