Skip to content

Commit 0b27ea9

Browse files
committed
Convert dev yamls into patches
1 parent 2005ae3 commit 0b27ea9

File tree

2 files changed

+1
-141
lines changed

2 files changed

+1
-141
lines changed
Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
kind: StatefulSet
2-
apiVersion: apps/v1beta1
2+
apiVersion: apps/v1
33
metadata:
44
name: csi-gce-pd-controller
55
spec:
6-
serviceName: "csi-gce-pd"
7-
replicas: 1
8-
selector:
9-
matchLabels:
10-
app: csi-gce-pd-driver
116
template:
12-
metadata:
13-
labels:
14-
app: csi-gce-pd-driver
157
spec:
16-
serviceAccount: csi-controller-sa
178
containers:
189
- name: csi-snapshotter
1910
imagePullPolicy: Always
@@ -27,51 +18,6 @@ spec:
2718
volumeMounts:
2819
- name: socket-dir
2920
mountPath: /csi
30-
- name: csi-provisioner
31-
imagePullPolicy: Always
32-
image: quay.io/k8scsi/csi-provisioner:v0.4.1
33-
args:
34-
- "--v=5"
35-
- "--provisioner=com.google.csi.gcepd"
36-
- "--csi-address=$(ADDRESS)"
37-
env:
38-
- name: ADDRESS
39-
value: /csi/csi.sock
40-
volumeMounts:
41-
- name: socket-dir
42-
mountPath: /csi
43-
- name: csi-attacher
44-
imagePullPolicy: Always
45-
image: quay.io/k8scsi/csi-attacher:v0.4.1
46-
args:
47-
- "--v=5"
48-
- "--csi-address=$(ADDRESS)"
49-
env:
50-
- name: ADDRESS
51-
value: /csi/csi.sock
52-
volumeMounts:
53-
- name: socket-dir
54-
mountPath: /csi
5521
- name: gce-pd-driver
5622
imagePullPolicy: Always
5723
image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
58-
args:
59-
- "--v=5"
60-
- "--endpoint=$(CSI_ENDPOINT)"
61-
env:
62-
- name: CSI_ENDPOINT
63-
value: unix:/csi/csi.sock
64-
- name: GOOGLE_APPLICATION_CREDENTIALS
65-
value: "/etc/cloud-sa/cloud-sa.json"
66-
volumeMounts:
67-
- name: socket-dir
68-
mountPath: /csi
69-
- name: cloud-sa-volume
70-
readOnly: true
71-
mountPath: "/etc/cloud-sa"
72-
volumes:
73-
- name: socket-dir
74-
emptyDir: {}
75-
- name: cloud-sa-volume
76-
secret:
77-
secretName: cloud-sa
Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,11 @@
1-
#TODO(#40): Force DaemonSet to not run on master.
21
kind: DaemonSet
32
apiVersion: apps/v1
43
metadata:
54
name: csi-gce-pd-node
65
spec:
7-
selector:
8-
matchLabels:
9-
app: csi-gce-pd-driver
106
template:
11-
metadata:
12-
labels:
13-
app: csi-gce-pd-driver
147
spec:
15-
serviceAccount: csi-node-sa
168
containers:
17-
- name: csi-driver-registrar
18-
imagePullPolicy: Always
19-
image: quay.io/k8scsi/driver-registrar:v0.4.1
20-
args:
21-
- "--v=5"
22-
- "--csi-address=$(ADDRESS)"
23-
- "--kubelet-registration-path=/var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock"
24-
env:
25-
- name: ADDRESS
26-
value: /var/lib/kubelet/plugins/com.google.csi.gcepd/csi.sock
27-
- name: KUBE_NODE_NAME
28-
valueFrom:
29-
fieldRef:
30-
fieldPath: spec.nodeName
31-
volumeMounts:
32-
- name: plugin-dir
33-
mountPath: /var/lib/kubelet/plugins/com.google.csi.gcepd/
34-
- name: registration-dir
35-
mountPath: /registration
369
- name: gce-pd-driver
37-
securityContext:
38-
privileged: true
3910
imagePullPolicy: Always
4011
image: gcr.io/dyzz-csi-staging/csi/gce-pd-driver:latest
41-
args:
42-
- "--v=5"
43-
- "--endpoint=$(CSI_ENDPOINT)"
44-
env:
45-
- name: CSI_ENDPOINT
46-
value: unix:/csi/csi.sock
47-
volumeMounts:
48-
- name: kubelet-dir
49-
mountPath: /var/lib/kubelet
50-
mountPropagation: "Bidirectional"
51-
- name: plugin-dir
52-
mountPath: /csi
53-
- name: device-dir
54-
mountPath: /dev
55-
# The following mounts are required to trigger host udevadm from container
56-
- name: udev-rules-etc
57-
mountPath: /etc/udev
58-
- name: udev-rules-lib
59-
mountPath: /lib/udev
60-
- name: udev-socket
61-
mountPath: /run/udev
62-
- name: sys
63-
mountPath: /sys
64-
volumes:
65-
- name: registration-dir
66-
hostPath:
67-
path: /var/lib/kubelet/plugins/
68-
type: Directory
69-
- name: kubelet-dir
70-
hostPath:
71-
path: /var/lib/kubelet
72-
type: Directory
73-
- name: plugin-dir
74-
hostPath:
75-
path: /var/lib/kubelet/plugins/com.google.csi.gcepd/
76-
type: DirectoryOrCreate
77-
- name: device-dir
78-
hostPath:
79-
path: /dev
80-
type: Directory
81-
# The following mounts are required to trigger host udevadm from container
82-
- name: udev-rules-etc
83-
hostPath:
84-
path: /etc/udev
85-
type: Directory
86-
- name: udev-rules-lib
87-
hostPath:
88-
path: /lib/udev
89-
type: Directory
90-
- name: udev-socket
91-
hostPath:
92-
path: /run/udev
93-
type: Directory
94-
- name: sys
95-
hostPath:
96-
path: /sys
97-
type: Directory

0 commit comments

Comments
 (0)