Merge 65f4167 into 5d2c96f

.gitignore

@@ -4,5 +4,4 @@
 
 *.swp
 bin/
-vendor/
 *~

Dockerfile

@@ -15,12 +15,8 @@
 FROM golang:1.13.4-stretch as builder
 WORKDIR /go/src/github.com/kubernetes-sigs/aws-fsx-csi-driver
 
-# Cache go modules
-COPY go.mod .
-COPY go.sum .
-RUN go mod download
+COPY . .
 
-ADD . .
 RUN make
 
 FROM amazonlinux:2

Makefile

@@ -40,8 +40,16 @@ test:
 
 .PHONY: test-e2e
 test-e2e:
-	go get github.com/aws/aws-k8s-tester/e2e/tester/cmd/k8s-e2e-tester@master
-	TESTCONFIG=./tester/e2e-test-config.yaml ${GOPATH}/bin/k8s-e2e-tester
+	DRIVER_NAME=aws-fsx-csi-driver \
+	CONTAINER_NAME=fsx-plugin \
+	TEST_EXTRA_FLAGS='--cluster-name=$$CLUSTER_NAME' \
+	AWS_REGION=us-west-2 \
+	AWS_AVAILABILITY_ZONES=us-west-2a \
+	NODE_COUNT=1 \
+	TEST_PATH=./tests/e2e/... \
+	GINKGO_FOCUS=".*" \
+	GINKGO_SKIP="subPath.should.be.able.to.unmount.after.the.subpath.directory.is.deleted" \
+	./hack/e2e/run.sh
 
 .PHONY: image
 image:

helm/templates/controller.yaml → charts/aws-fsx-csi-driver/templates/controller.yaml

@@ -15,21 +15,16 @@ spec:
         {{- include "helm.selectorLabels" . | nindent 8 }}-controller
     spec:
       serviceAccountName: {{ include "helm.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.controllerService.podSecurityContext | nindent 8 }}
       priorityClassName: system-cluster-critical
       tolerations:
           - key: CriticalAddonsOnly
             operator: Exists
       containers:
         - name: fsx-plugin
-          securityContext:
-            {{- toYaml .Values.controllerService.fsxPlugin.securityContext | nindent 12 }}
-          image: "{{ .Values.controllerService.fsxPlugin.image.repository }}:{{ .Values.controllerService.fsxPlugin.image.tag }}"
-          imagePullPolicy: {{ .Values.controllerService.fsxPlugin.image.pullPolicy }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --endpoint=$(CSI_ENDPOINT)
-            {{- toYaml .Values.controllerService.fsxPlugin.extraArgs | nindent 12 }}
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
@@ -54,7 +49,7 @@ spec:
           image: "{{ .Values.controllerService.csiProvisioner.image.repository }}:{{ .Values.controllerService.csiProvisioner.image.tag }}"
           args:
             - --csi-address=$(ADDRESS)
-            {{- toYaml .Values.controllerService.csiProvisioner.extraArgs | nindent 12 }}
+            - --timeout=5m
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock

helm/templates/node.yaml → charts/aws-fsx-csi-driver/templates/node.yaml

@@ -13,18 +13,15 @@ spec:
       labels:
         {{- include "helm.selectorLabels" . | nindent 8 }}-daemonset
     spec:
-      securityContext:
-        {{- toYaml .Values.nodeService.podSecurityContext | nindent 8 }}
       hostNetwork: true
       containers:
         - name: fsx-plugin
           securityContext:
-            {{- toYaml .Values.nodeService.fsxPlugin.securityContext | nindent 12 }}
-          image: "{{ .Values.nodeService.fsxPlugin.image.repository }}:{{ .Values.nodeService.fsxPlugin.image.tag }}"
-          imagePullPolicy: {{ .Values.nodeService.fsxPlugin.image.pullPolicy }}
+            privileged: true
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - --endpoint=$(CSI_ENDPOINT)
-            {{- toYaml .Values.nodeService.fsxPlugin.extraArgs | nindent 12 }}
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
@@ -49,14 +46,11 @@ spec:
           resources:
             {{- toYaml .Values.nodeService.fsxPlugin.resources | nindent 12 }}
         - name: csi-driver-registrar
-          securityContext:
-            {{- toYaml .Values.nodeService.csiDriverRegistrar.securityContext | nindent 12 }}
           image: "{{ .Values.nodeService.csiDriverRegistrar.image.repository }}:{{ .Values.nodeService.csiDriverRegistrar.image.tag }}"
           imagePullPolicy: {{ .Values.nodeService.csiDriverRegistrar.image.pullPolicy }}
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-            {{- toYaml .Values.nodeService.csiDriverRegistrar.extraArgs | nindent 12 }}
           env:
             - name: ADDRESS
               value: /csi/csi.sock

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

@@ -0,0 +1,59 @@
+# Default values for helm.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+image:
+  repository: amazon/aws-fsx-csi-driver
+  tag: v0.4.0
+  pullPolicy: IfNotPresent
+
+controllerService:
+  replicaCount: 2
+
+  nodeSelector:
+    kubernetes.io/os: linux
+
+  fsxPlugin:
+    resources: {}
+
+  csiProvisioner:
+    image:
+      repository: k8s.gcr.io/sig-storage/csi-provisioner
+      tag: v2.1.1
+      pullPolicy: IfNotPresent
+
+    resources: {}
+
+nodeService:
+  nodeSelector:
+    kubernetes.io/os: linux
+
+  fsxPlugin:
+    resources: {}
+
+  csiDriverRegistrar:
+    image:
+      repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
+      tag: v2.1.0
+      pullPolicy: IfNotPresent
+
+    resources: {}
+
+  livenessProbe:
+    image:
+      repository: k8s.gcr.io/sig-storage/livenessprobe
+      tag: v2.2.0
+      pullPolicy: Always
+
+    resources: {}
+
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  annotations: {}
+  ## Enable if EKS IAM for SA is used
+  #  eks.amazonaws.com/role-arn: arn:aws:iam::111122223333:role/fsx-csi-role
+  name: fsx-csi-controller-sa

go.mod

@@ -19,15 +19,15 @@ require (
 replace (
 	k8s.io/api => k8s.io/api v0.17.0
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.17.1-beta.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.17.0
 	k8s.io/apiserver => k8s.io/apiserver v0.17.0
 	k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.0
 	k8s.io/client-go => k8s.io/client-go v0.17.0
 	k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.0
 	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.0
-	k8s.io/code-generator => k8s.io/code-generator v0.17.1-beta.0
+	k8s.io/code-generator => k8s.io/code-generator v0.17.0
 	k8s.io/component-base => k8s.io/component-base v0.17.0
-	k8s.io/cri-api => k8s.io/cri-api v0.17.1-beta.0
+	k8s.io/cri-api => k8s.io/cri-api v0.17.0
 	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.0
 	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.0
 	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.0