Skip to content

Commit 55d1a9c

Browse files
committed
Merge branch 'v1.0-branch' of github.com:kubeflow/manifests into v1.0-branch
2 parents a39d7b3 + 95f88c1 commit 55d1a9c

123 files changed

Lines changed: 4475 additions & 830 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

aws/aws-efs-csi-driver/base/csi-attacher-cluster-role-binding.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

aws/aws-efs-csi-driver/base/csi-attacher-cluster-role.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

aws/aws-efs-csi-driver/base/csi-controller-sa.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

aws/aws-efs-csi-driver/base/csi-controller-stateful-set.yaml

Lines changed: 0 additions & 51 deletions
This file was deleted.

aws/aws-efs-csi-driver/base/csi-default-storage.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
apiVersion: storage.k8s.io/v1beta1
3+
kind: CSIDriver
4+
metadata:
5+
name: efs.csi.aws.com
6+
spec:
7+
attachRequired: false

aws/aws-efs-csi-driver/base/csi-node-cluster-role-binding.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

aws/aws-efs-csi-driver/base/csi-node-cluster-role.yaml

Lines changed: 0 additions & 23 deletions
This file was deleted.

aws/aws-efs-csi-driver/base/csi-node-daemon-set.yaml renamed to aws/aws-efs-csi-driver/base/csi-node-daemonset.yaml

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
---
2+
# Node Service
13
kind: DaemonSet
24
apiVersion: apps/v1
35
metadata:
@@ -11,14 +13,16 @@ spec:
1113
labels:
1214
app: efs-csi-node
1315
spec:
14-
serviceAccount: efs-csi-node-sa
16+
nodeSelector:
17+
beta.kubernetes.io/os: linux
1518
hostNetwork: true
19+
tolerations:
20+
- operator: Exists
1621
containers:
1722
- name: efs-plugin
1823
securityContext:
1924
privileged: true
2025
image: amazon/aws-efs-csi-driver:latest
21-
imagePullPolicy: Always
2226
args:
2327
- --endpoint=$(CSI_ENDPOINT)
2428
- --logtostderr
@@ -32,16 +36,24 @@ spec:
3236
mountPropagation: "Bidirectional"
3337
- name: plugin-dir
3438
mountPath: /csi
35-
- name: device-dir
36-
mountPath: /dev
39+
- name: efs-state-dir
40+
mountPath: /var/run/efs
41+
ports:
42+
- containerPort: 9809
43+
name: healthz
44+
protocol: TCP
45+
livenessProbe:
46+
httpGet:
47+
path: /healthz
48+
port: healthz
49+
initialDelaySeconds: 10
50+
timeoutSeconds: 3
51+
periodSeconds: 2
52+
failureThreshold: 5
3753
- name: csi-driver-registrar
38-
image: quay.io/k8scsi/driver-registrar:v0.4.2
39-
imagePullPolicy: Always
54+
image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
4055
args:
4156
- --csi-address=$(ADDRESS)
42-
- --mode=node-register
43-
- --driver-requires-attachment=true
44-
- --pod-info-mount-version="v1"
4557
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
4658
- --v=5
4759
env:
@@ -58,20 +70,30 @@ spec:
5870
mountPath: /csi
5971
- name: registration-dir
6072
mountPath: /registration
73+
- name: liveness-probe
74+
imagePullPolicy: Always
75+
image: quay.io/k8scsi/livenessprobe:v1.1.0
76+
args:
77+
- --csi-address=/csi/csi.sock
78+
- --health-port=9809
79+
volumeMounts:
80+
- mountPath: /csi
81+
name: plugin-dir
6182
volumes:
6283
- name: kubelet-dir
6384
hostPath:
6485
path: /var/lib/kubelet
6586
type: Directory
87+
- name: registration-dir
88+
hostPath:
89+
path: /var/lib/kubelet/plugins_registry/
90+
type: Directory
6691
- name: plugin-dir
6792
hostPath:
6893
path: /var/lib/kubelet/plugins/efs.csi.aws.com/
6994
type: DirectoryOrCreate
70-
- name: registration-dir
71-
hostPath:
72-
path: /var/lib/kubelet/plugins/
73-
type: Directory
74-
- name: device-dir
95+
- name: efs-state-dir
7596
hostPath:
76-
path: /dev
77-
type: Directory
97+
path: /var/run/efs
98+
type: DirectoryOrCreate
99+

aws/aws-efs-csi-driver/base/csi-node-sa.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)