Skip to content

Commit 68d4240

Browse files
committed
Update env variables
1 parent 603876f commit 68d4240

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ spec:
117117
- --loglevel=debug
118118
- --fss-endpoint=unix:///fss/csi.sock
119119
- --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
122120
command:
123121
- /usr/local/bin/oci-csi-node-driver
124122
env:
@@ -137,7 +135,7 @@ spec:
137135
value: "{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}fss.csi.oraclecloud.com"
138136
- name: LUSTRE_VOLUME_DRIVER_NAME
139137
value: "{{ if .Values.customHandle }}{{ .Values.customHandle }}.{{ end }}lustre.csi.oraclecloud.com"
140-
image: ghcr.io/yashasg98/cloud-provider-oci:vcustomize.driver.name2
138+
image: ghcr.io/uneet7/cloud-provider-oci:v0.0.2
141139
securityContext:
142140
privileged: true
143141
volumeMounts:

pkg/csi/driver/driver.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ import (
4747
var (
4848
BlockVolumeDriverName string
4949
FSSDriverName string
50+
LustreDriverName string
5051
)
5152

5253
func init() {
5354
BlockVolumeDriverName = getEnv("BLOCK_VOLUME_DRIVER_NAME", "blockvolume.csi.oraclecloud.com")
5455
FSSDriverName = getEnv("FSS_VOLUME_DRIVER_NAME", "fss.csi.oraclecloud.com")
56+
LustreDriverName = getEnv("LUSTRE_VOLUME_DRIVER_NAME", "lustre.csi.oraclecloud.com")
5557
}
5658

5759
func getEnv(key, fallback string) string {
@@ -69,9 +71,6 @@ const (
6971
// FSSDriverVersion is the version of the CSI driver
7072
FSSDriverVersion = "0.1.0"
7173

72-
// LustreDriverName defines the driver name to be used in Kubernetes
73-
LustreDriverName = "lustre.csi.oraclecloud.com"
74-
7574
// LustreDriverVersion is the version of the CSI driver
7675
LustreDriverVersion = "0.1.0"
7776
// Default config file path
@@ -136,7 +135,7 @@ type NodeDriver struct {
136135
volumeLocks *csi_util.VolumeLocks
137136
nodeMetadata *csi_util.NodeMetadata
138137
csi.UnimplementedNodeServer
139-
csiConfig *csi_util.CSIConfig
138+
csiConfig *csi_util.CSIConfig
140139
}
141140

142141
// BlockVolumeNodeDriver extends NodeDriver

0 commit comments

Comments
 (0)