Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions deployments/helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@ Alternatively, a YAML file that specifies the values of the parameters can be pr
| `nodeplugin.registrar.image.pullPolicy` | Pull policy for csi-node-driver-registrar image. |
| `nodeplugin.registrar.image.resources` | Resource constraints for the `registrar` container. |
| `nodeplugin.updateStrategySpec` | DaemonSet update strategy. |
| `nodeplugin.podSecurityContext` | Pod-level security context for nodeplugin DaemonSet. |
| `nodeplugin.priorityClassName` | Pod priority class name of the nodeplugin DaemonSet. |
| `nodeplugin.nodeSelector` | Pod node selector of the nodeplugin DaemonSet. |
| `nodeplugin.tolerations` | Pod tolerations of the nodeplugin DaemonSet. |
| `nodeplugin.affinity` | Pod node affinity of the nodeplugin DaemonSet. |
| `controllerplugin.name` | Component name for controller plugin component. Used as `component` label value and to generate Deployment name. |
| `controllerplugin.podSecurityContext` | Pod-level security context for controllerplugin deployment. |
| `controllerplugin.plugin.image.repository` | Container image repository for CVMFS CSI controller plugin. |
| `controllerplugin.plugin.image.tag` | Container image tag for CVMFS CSI controller plugin. |
| `controllerplugin.plugin.image.pullPolicy` | Pull policy for CVMFS CSI controller plugin image. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ spec:
labels:
{{- include "cvmfs-csi.controllerplugin.labels" . | nindent 8 }}
spec:
{{- with .Values.controllerplugin.podSecurityContext }}
securityContext: {{ toYaml . | nindent 8 }}
{{- end }}
serviceAccount: {{ include "cvmfs-csi.serviceAccountName.controllerplugin" . }}
containers:
- name: provisioner
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ spec:
spec:
# hostPID is required for autofs to work.
hostPID: {{ .Values.nodeplugin.hostPID }}
{{- with .Values.nodeplugin.podSecurityContext }}
securityContext: {{ toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.nodeplugin.serviceAccount.use }}
serviceAccount: {{ include "cvmfs-csi.serviceAccountName.nodeplugin" . }}
{{- end }}
Expand Down
52 changes: 32 additions & 20 deletions deployments/helm/cvmfs-csi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ nodeplugin:

# Extra volumes to be appended to nodeplugin's Pod.spec.volumes.
extraVolumes:
- name: etc-cvmfs-default-conf
configMap:
name: cvmfs-csi-default-local
- name: etc-cvmfs-config-d
configMap:
name: cvmfs-csi-config-d
- name: etc-cvmfs-default-conf
configMap:
name: cvmfs-csi-default-local
- name: etc-cvmfs-config-d
configMap:
name: cvmfs-csi-config-d

# CVMFS CSI image and container resources specs.
plugin:
Expand All @@ -84,11 +84,11 @@ nodeplugin:
# Extra volume mounts to append to nodeplugin's
# Pod.spec.containers[name="nodeplugin"].volumeMounts.
extraVolumeMounts:
- name: etc-cvmfs-default-conf
mountPath: /etc/cvmfs/default.local
subPath: default.local
- name: etc-cvmfs-config-d
mountPath: /etc/cvmfs/config.d
- name: etc-cvmfs-default-conf
mountPath: /etc/cvmfs/default.local
subPath: default.local
- name: etc-cvmfs-config-d
mountPath: /etc/cvmfs/config.d

# automount-reconciler image and container resources specs.
automountReconciler:
Expand All @@ -100,11 +100,11 @@ nodeplugin:
# Extra volume mounts to append to nodeplugin's
# Pod.spec.containers[name="automountReconciler"].volumeMounts.
extraVolumeMounts:
- name: etc-cvmfs-default-conf
mountPath: /etc/cvmfs/default.local
subPath: default.local
- name: etc-cvmfs-config-d
mountPath: /etc/cvmfs/config.d
- name: etc-cvmfs-default-conf
mountPath: /etc/cvmfs/default.local
subPath: default.local
- name: etc-cvmfs-config-d
mountPath: /etc/cvmfs/config.d

# automount-runner image and container resources specs.
singlemount:
Expand Down Expand Up @@ -133,6 +133,11 @@ nodeplugin:
# too in order to refresh the mounts.
type: OnDelete

# Pod-level security context for nodeplugin daemonset.
podSecurityContext:
seccompProfile:
type: RuntimeDefault

# Pod priority class name.
priorityClassName: system-node-critical

Expand Down Expand Up @@ -161,16 +166,18 @@ nodeplugin:
serviceAccountName: cvmfs-nodeplugin

# Whether to create ServiceAccount in the CVMFS CSI namespace.
# If not, and `use` is set to true, it is expected the ServiceAccount is already present.
# If not, and `use` is set to true, it is expected the ServiceAccount is
# already present.
create: false

# Whether to use this ServiceAccount in Node plugin DaemonSet.
use: false

# CSI Controller plugin Deployment configuration.
# CVMFS CSI supports volume provisioning, however the provisioned volumes only fulfill the role
# of a reference to CVMFS repositories used inside the CO (e.g. Kubernetes), and are not modifying
# the CVMFS store in any way.
#
# CVMFS CSI supports volume provisioning, however the provisioned volumes only
# fulfil the role of a reference to CVMFS repositories used inside the CO
# (e.g. Kubernetes), and are not modifying the CVMFS store in any way.
controllerplugin:

# Component name. Used as `component` label value
Expand Down Expand Up @@ -203,6 +210,11 @@ controllerplugin:
deploymentStrategySpec:
type: RollingUpdate

# Pod-level security context for controllerplugin deployment.
podSecurityContext:
seccompProfile:
type: RuntimeDefault

# Pod priority class name.
priorityClassName: ""

Expand Down