Skip to content
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

Jump to bottom

Feature: make data dir configurable #4

Closed
wants to merge 9 commits into from
Closed

Feature: make data dir configurable #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3e012e3
Make data-dir configurable
Sep 30, 2020
c4defb8
add data_dir environment variable
Sep 30, 2020
1202b80
separate rawfile path and data path variable
Sep 30, 2020
6efd9ae
update templates rawfile directory env
Sep 30, 2020
ab6c6a3
Remove data_dir env on Dockerfile & change default value rawfile_dir
Oct 6, 2020
9a7df8b
Remove data_dir env on Dockerfile & change default value rawfile_dir
Oct 6, 2020
c25849b
Merge remote-tracking branch 'ronaldyuwandika/feature/make_data-dir_c…
Oct 6, 2020
d435bcc
Merge remote-tracking branch 'ronaldyuwandika/feature/make_data-dir_c…
Oct 6, 2020
0023ef3
Merge remote-tracking branch 'ronaldyuwandika/feature/make_data-dir_c…
Oct 6, 2020
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
6 changes: 4 additions & 2 deletions deploy/charts/rawfile-csi/templates/01-node-plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
type: DirectoryOrCreate
- name: data-dir
hostPath:
path: /var/csi/rawfile
path: {{ .Values.node.rawfile_dir }}
type: DirectoryOrCreate
containers:
- name: csi-driver
Expand All @@ -66,6 +66,8 @@ spec:
value: unix:///csi/csi.sock
- name: IMAGE_REPOSITORY
value: "{{ .Values.node.image.repository }}"
- name: DATA_DIR
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "remove data_dir variable" applies to this one too

value: "{{ .Values.node.data_dir }}"
{{- if regexMatch "^.*-ci$" .Values.node.image.tag }}
- name: IMAGE_TAG
value: "{{ .Values.node.image.tag }}"
Expand All @@ -85,7 +87,7 @@ spec:
mountPath: /var/lib/kubelet
mountPropagation: "Bidirectional"
- name: data-dir
mountPath: /data
mountPath: {{ .Values.node.data_dir }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

resources:
{{- toYaml .Values.node.resources | nindent 12 }}
- name: node-driver-registrar
Expand Down
4 changes: 4 additions & 0 deletions deploy/charts/rawfile-csi/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ defaults: &defaults
requests:
cpu: 10m
memory: 100Mi
rawfile_dir: /var/csi/rawfile
data_dir: /data
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto




controller:
<< : *defaults
Expand Down
4 changes: 2 additions & 2 deletions templates/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
volumes:
- name: data-dir
hostPath:
path: /var/csi/rawfile
path: {rawfile_dir}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this needs to be passed into the templating function so that it can get rendered.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
can i change it into templating function like this?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The values are interpolated not by helm, but the python code. So that's where the code needs to be updated.

type: DirectoryOrCreate
nodeSelector: {nodeSelector}
containers:
Expand All @@ -20,7 +20,7 @@ spec:
imagePullPolicy: IfNotPresent
volumeMounts:
- name: data-dir
mountPath: /data
mountPath: {data_dir}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

resources:
requests: &rsc
cpu: 10m
Expand Down