Skip to content

chore(helm): Adds custom iSCSIadm ConfigMap and HostPID options #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leosunmo wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

chore(helm): Adds custom iSCSIadm ConfigMap and HostPID options #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions deploy/helm/charts/templates/csi-iscsiadm-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ metadata:
name: openebs-jiva-csi-iscsiadm
data:
iscsiadm: |
{{- if .Values.csiNode.customIscsiadmConfig }}
{{- .Values.csiNode.customIscsiadmConfig | nindent 4 }}
{{- else }}
#!/bin/sh
if [ -x /host/sbin/iscsiadm ]; then
chroot /host /sbin/iscsiadm "$@"
Expand All @@ -16,3 +19,4 @@ data:
else
chroot /host iscsiadm "$@"
fi
{{- end }}
1 change: 1 addition & 0 deletions deploy/helm/charts/templates/csi-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spec:
priorityClassName: {{ template "jiva.csiNode.priorityClassName" . }}
serviceAccountName: {{ .Values.serviceAccount.csiNode.name }}
hostNetwork: true
hostPID: {{ .Values.csiNode.hostPID }}
containers:
- name: {{ .Values.csiNode.driverRegistrar.name }}
image: "{{ .Values.csiNode.driverRegistrar.image.registry }}{{ .Values.csiNode.driverRegistrar.image.repository }}:{{ .Values.csiNode.driverRegistrar.image.tag }}"
Expand Down
6 changes: 6 additions & 0 deletions deploy/helm/charts/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ csiNode:
name: jiva-csi-node-critical
value: 900001000
componentName: "openebs-jiva-csi-node"
hostPID: false
# customIscsiadmConfig is used to override the default iscsiadm config
# customIscsiadmConfig: |
# #!/bin/sh
# iscsid_pid=$(pgrep iscsid)
# nsenter --mount="/proc/${iscsid_pid}/ns/mnt" --net="/proc/${iscsid_pid}/ns/net" -- /usr/local/sbin/iscsiadm "$@"
logLevel: "5"
driverRegistrar:
name: "csi-node-driver-registrar"
Expand Down