Merge branch 'v1.0-branch' of github.com:kubeflow/manifests into v1.0…

…-branch
kubeflow · Apr 16, 2020 · 55d1a9c · 55d1a9c
2 parents a39d7b3 + 95f88c1
commit 55d1a9c
Show file tree

Hide file tree

Showing 123 changed files with 4,475 additions and 830 deletions.
diff --git a/aws/aws-efs-csi-driver/base/csi-attacher-cluster-role-binding.yaml b/aws/aws-efs-csi-driver/base/csi-attacher-cluster-role-binding.yaml
diff --git a/aws/aws-efs-csi-driver/base/csi-attacher-cluster-role.yaml b/aws/aws-efs-csi-driver/base/csi-attacher-cluster-role.yaml
diff --git a/aws/aws-efs-csi-driver/base/csi-controller-sa.yaml b/aws/aws-efs-csi-driver/base/csi-controller-sa.yaml
diff --git a/aws/aws-efs-csi-driver/base/csi-controller-stateful-set.yaml b/aws/aws-efs-csi-driver/base/csi-controller-stateful-set.yaml
diff --git a/aws/aws-efs-csi-driver/base/csi-default-storage.yaml b/aws/aws-efs-csi-driver/base/csi-default-storage.yaml
diff --git a/aws/aws-efs-csi-driver/base/csi-driver.yaml b/aws/aws-efs-csi-driver/base/csi-driver.yaml
@@ -0,0 +1,7 @@
+---
+apiVersion: storage.k8s.io/v1beta1
+kind: CSIDriver
+metadata:
+  name: efs.csi.aws.com
+spec:
+  attachRequired: false
diff --git a/aws/aws-efs-csi-driver/base/csi-node-cluster-role-binding.yaml b/aws/aws-efs-csi-driver/base/csi-node-cluster-role-binding.yaml
diff --git a/aws/aws-efs-csi-driver/base/csi-node-cluster-role.yaml b/aws/aws-efs-csi-driver/base/csi-node-cluster-role.yaml
diff --git a/...-csi-driver/base/csi-node-daemon-set.yaml → ...s-csi-driver/base/csi-node-daemonset.yaml b/...-csi-driver/base/csi-node-daemon-set.yaml → ...s-csi-driver/base/csi-node-daemonset.yaml
@@ -1,3 +1,5 @@
+---
+# Node Service
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
@@ -11,14 +13,16 @@ spec:
       labels:
         app: efs-csi-node
     spec:
-      serviceAccount: efs-csi-node-sa
+      nodeSelector:
+        beta.kubernetes.io/os: linux
       hostNetwork: true
+      tolerations:
+        - operator: Exists
       containers:
         - name: efs-plugin
           securityContext:
             privileged: true
           image: amazon/aws-efs-csi-driver:latest
-          imagePullPolicy: Always
           args:
             - --endpoint=$(CSI_ENDPOINT)
             - --logtostderr
@@ -32,16 +36,24 @@ spec:
               mountPropagation: "Bidirectional"
             - name: plugin-dir
               mountPath: /csi
-            - name: device-dir
-              mountPath: /dev
+            - name: efs-state-dir
+              mountPath: /var/run/efs
+          ports:
+            - containerPort: 9809
+              name: healthz
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: 10
+            timeoutSeconds: 3
+            periodSeconds: 2
+            failureThreshold: 5
         - name: csi-driver-registrar
-          image: quay.io/k8scsi/driver-registrar:v0.4.2
-          imagePullPolicy: Always
+          image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
           args:
             - --csi-address=$(ADDRESS)
-            - --mode=node-register
-            - --driver-requires-attachment=true
-            - --pod-info-mount-version="v1"
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
             - --v=5
           env:
@@ -58,20 +70,30 @@ spec:
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
+        - name: liveness-probe
+          imagePullPolicy: Always
+          image: quay.io/k8scsi/livenessprobe:v1.1.0
+          args:
+            - --csi-address=/csi/csi.sock
+            - --health-port=9809
+          volumeMounts:
+            - mountPath: /csi
+              name: plugin-dir
       volumes:
         - name: kubelet-dir
           hostPath:
             path: /var/lib/kubelet
             type: Directory
+        - name: registration-dir
+          hostPath:
+            path: /var/lib/kubelet/plugins_registry/
+            type: Directory
         - name: plugin-dir
           hostPath:
             path: /var/lib/kubelet/plugins/efs.csi.aws.com/
             type: DirectoryOrCreate
-        - name: registration-dir
-          hostPath:
-            path: /var/lib/kubelet/plugins/
-            type: Directory
-        - name: device-dir
+        - name: efs-state-dir
           hostPath:
-            path: /dev
-            type: Directory
+            path: /var/run/efs
+            type: DirectoryOrCreate
+
diff --git a/aws/aws-efs-csi-driver/base/csi-node-sa.yaml b/aws/aws-efs-csi-driver/base/csi-node-sa.yaml
diff --git a/aws/aws-efs-csi-driver/base/kustomization.yaml b/aws/aws-efs-csi-driver/base/kustomization.yaml
@@ -2,24 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: kubeflow
 resources:
-- csi-controller-stateful-set.yaml
-- csi-attacher-cluster-role.yaml
-- csi-attacher-cluster-role-binding.yaml
-- csi-controller-sa.yaml
-- csi-node-cluster-role.yaml
-- csi-node-cluster-role-binding.yaml
-- csi-node-daemon-set.yaml
-- csi-node-sa.yaml
-- csi-default-storage.yaml
+- csi-driver.yaml
+- csi-node-daemonset.yaml
 generatorOptions:
   disableNameSuffixHash: true
 images:
-- name: quay.io/k8scsi/driver-registrar
-  newName: quay.io/k8scsi/driver-registrar
-  newTag: v0.4.2
 - name: amazon/aws-efs-csi-driver
   newName: amazon/aws-efs-csi-driver
-  newTag: latest
-- name: quay.io/k8scsi/csi-attacher
-  newName: quay.io/k8scsi/csi-attacher
-  newTag: v0.4.2
+  newTag: v0.3.0
diff --git a/aws/aws-fsx-csi-driver/base/csi-attacher-cluster-role-binding.yaml b/aws/aws-fsx-csi-driver/base/csi-attacher-cluster-role-binding.yaml
diff --git a/aws/aws-fsx-csi-driver/base/csi-attacher-cluster-role.yaml b/aws/aws-fsx-csi-driver/base/csi-attacher-cluster-role.yaml
diff --git a/aws/aws-fsx-csi-driver/base/csi-controller-cluster-role-binding.yaml b/aws/aws-fsx-csi-driver/base/csi-controller-cluster-role-binding.yaml
diff --git a/aws/aws-fsx-csi-driver/base/csi-controller-cluster-role.yaml b/aws/aws-fsx-csi-driver/base/csi-controller-cluster-role.yaml
diff --git a/aws/aws-fsx-csi-driver/base/csi-controller-sa.yaml b/aws/aws-fsx-csi-driver/base/csi-controller-sa.yaml
@@ -2,3 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: fsx-csi-controller-sa
+  namespace: kubeflow
+  #Enable if EKS IAM for SA is used
+  #annotations:
+  #  eks.amazonaws.com/role-arn: arn:aws:iam::111122223333:role/fsx-csi-role