Skip to content

Commit 56e5ba5

Browse files
committed
Update lustre manifests
1 parent 1a1cd15 commit 56e5ba5

File tree

3 files changed

+81
-3
lines changed

3 files changed

+81
-3
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release
33
on:
44
push:
55
# Build and publish artifacts for a release
6-
tags:
6+
branches:
77
- "v*.*.*"
88

99
jobs:

manifests/container-storage-interface/csi/templates/oci-csi-node-driver.yaml

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ metadata:
1313
spec:
1414
fsGroupPolicy: File
1515
---
16+
apiVersion: storage.k8s.io/v1
17+
kind: CSIDriver
18+
metadata:
19+
name: {{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}lustre.csi.oraclecloud.com
20+
spec:
21+
attachRequired: false
22+
podInfoOnMount: false
23+
fsGroupPolicy: File
24+
---
1625
kind: ConfigMap
1726
apiVersion: v1
1827
metadata:
@@ -107,6 +116,9 @@ spec:
107116
- --nodeid=$(KUBE_NODE_NAME)
108117
- --loglevel=debug
109118
- --fss-endpoint=unix:///fss/csi.sock
119+
- --lustre-endpoint=unix:///lustre/csi.sock
120+
- --lustre-csi-address=/lustre/csi.sock
121+
- --lustre-kubelet-registration-path=/var/lib/kubelet/plugins/{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}lustre.csi.oraclecloud.com/csi.sock
110122
command:
111123
- /usr/local/bin/oci-csi-node-driver
112124
env:
@@ -117,11 +129,15 @@ spec:
117129
fieldPath: spec.nodeName
118130
- name: PATH
119131
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
132+
- name: LUSTRE_DRIVER_ENABLED
133+
value: "true"
120134
- name: BLOCK_VOLUME_DRIVER_NAME
121135
value: "{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}blockvolume.csi.oraclecloud.com"
122136
- name: FSS_VOLUME_DRIVER_NAME
123137
value: "{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}fss.csi.oraclecloud.com"
124-
image: ghcr.io/oracle/cloud-provider-oci:v1.32.0
138+
- name: LUSTRE_VOLUME_DRIVER_NAME
139+
value: "{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}lustre.csi.oraclecloud.com"
140+
image: ghcr.io/yashasg98/cloud-provider-oci:vcustomize.driver.name2
125141
securityContext:
126142
privileged: true
127143
volumeMounts:
@@ -152,6 +168,8 @@ spec:
152168
- mountPath: /sbin/mount
153169
name: fss-driver-mounts
154170
subPath: mount
171+
- mountPath: /lustre
172+
name: lustre-plugin-dir
155173
- name: csi-node-registrar
156174
args:
157175
- --csi-address=/csi/csi.sock
@@ -190,6 +208,25 @@ spec:
190208
name: fss-plugin-dir
191209
- mountPath: /registration
192210
name: registration-dir
211+
- name: csi-node-registrar-lustre
212+
args:
213+
- --csi-address=/lustre/csi.sock
214+
- --kubelet-registration-path=/var/lib/kubelet/plugins/{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}lustre.csi.oraclecloud.com/csi.sock
215+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
216+
securityContext:
217+
privileged: true
218+
lifecycle:
219+
preStop:
220+
exec:
221+
command:
222+
- /bin/sh
223+
- -c
224+
- rm -rf /registration/{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}lustre.csi.oraclecloud.com /registration/{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}lustre.csi.oraclecloud.com-reg.sock
225+
volumeMounts:
226+
- mountPath: /lustre
227+
name: lustre-plugin-dir
228+
- mountPath: /registration
229+
name: registration-dir
193230
dnsPolicy: ClusterFirst
194231
hostNetwork: true
195232
restartPolicy: Always
@@ -212,6 +249,10 @@ spec:
212249
path: /var/lib/kubelet/plugins/{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}fss.csi.oraclecloud.com
213250
type: DirectoryOrCreate
214251
name: fss-plugin-dir
252+
- hostPath:
253+
path: /var/lib/kubelet/plugins/{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}lustre.csi.oraclecloud.com
254+
type: DirectoryOrCreate
255+
name: lustre-plugin-dir
215256
- hostPath:
216257
path: /var/lib/kubelet
217258
type: Directory

manifests/container-storage-interface/oci-csi-node-driver.yaml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ metadata:
1313
spec:
1414
fsGroupPolicy: File
1515
---
16+
apiVersion: storage.k8s.io/v1
17+
kind: CSIDriver
18+
metadata:
19+
name: lustre.csi.oraclecloud.com
20+
spec:
21+
attachRequired: false
22+
podInfoOnMount: false
23+
fsGroupPolicy: File
24+
---
1625
kind: ConfigMap
1726
apiVersion: v1
1827
metadata:
@@ -107,6 +116,7 @@ spec:
107116
- --nodeid=$(KUBE_NODE_NAME)
108117
- --loglevel=debug
109118
- --fss-endpoint=unix:///fss/csi.sock
119+
- --lustre-endpoint=unix:///lustre/csi.sock
110120
command:
111121
- /usr/local/bin/oci-csi-node-driver
112122
env:
@@ -117,7 +127,9 @@ spec:
117127
fieldPath: spec.nodeName
118128
- name: PATH
119129
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
120-
image: ghcr.io/oracle/cloud-provider-oci:v1.32.0
130+
- name: LUSTRE_DRIVER_ENABLED
131+
value: "true"
132+
image: ghcr.io/oracle/cloud-provider-oci:v1.30.0
121133
securityContext:
122134
privileged: true
123135
volumeMounts:
@@ -148,6 +160,8 @@ spec:
148160
- mountPath: /sbin/mount
149161
name: fss-driver-mounts
150162
subPath: mount
163+
- mountPath: /lustre
164+
name: lustre-plugin-dir
151165
- name: csi-node-registrar
152166
args:
153167
- --csi-address=/csi/csi.sock
@@ -186,6 +200,25 @@ spec:
186200
name: fss-plugin-dir
187201
- mountPath: /registration
188202
name: registration-dir
203+
- name: csi-node-registrar-lustre
204+
args:
205+
- --csi-address=/lustre/csi.sock
206+
- --kubelet-registration-path=/var/lib/kubelet/plugins/lustre.csi.oraclecloud.com/csi.sock
207+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
208+
securityContext:
209+
privileged: true
210+
lifecycle:
211+
preStop:
212+
exec:
213+
command:
214+
- /bin/sh
215+
- -c
216+
- rm -rf /registration/lustre.csi.oraclecloud.com /registration/lustre.csi.oraclecloud.com-reg.sock
217+
volumeMounts:
218+
- mountPath: /lustre
219+
name: lustre-plugin-dir
220+
- mountPath: /registration
221+
name: registration-dir
189222
dnsPolicy: ClusterFirst
190223
hostNetwork: true
191224
restartPolicy: Always
@@ -224,6 +257,10 @@ spec:
224257
path: /
225258
type: Directory
226259
name: host-root
260+
- hostPath:
261+
path: /var/lib/kubelet/plugins/lustre.csi.oraclecloud.com
262+
type: DirectoryOrCreate
263+
name: lustre-plugin-dir
227264
- configMap:
228265
name: oci-csi-iscsiadm
229266
defaultMode: 0755

0 commit comments

Comments
 (0)