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

cherry-pick #552 #591

Merged
merged 6 commits into from
Sep 24, 2024
Merged

cherry-pick #552 #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e7c178
docs(README): update the version in chart README
Abhinandan-Purkait Jul 4, 2024
cc9f728
feat(helm): remove anti-affinity from the zfs controller
Abhinandan-Purkait Jul 3, 2024
720e67e
using custom template function
w3aman May 2, 2024
337755a
chore: prepare charts for release 2.6.0
Abhinandan-Purkait Jul 3, 2024
81fa6ee
fix(path): handle trailing slash (/) in kubelet directory
w3aman May 2, 2024
4dea4c2
using custom template function
w3aman May 2, 2024
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: 1 addition & 1 deletion deploy/helm/charts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The following table lists the configurable parameters of the OpenEBS ZFS Localpv
| `zfsPlugin.image.registry`| Registry for openebs-zfs-plugin image| `""`|
| `zfsPlugin.image.repository`| Image repository for openebs-zfs-plugin| `openebs/zfs-driver`|
| `zfsPlugin.image.pullPolicy`| Image pull policy for openebs-zfs-plugin| `IfNotPresent`|
| `zfsPlugin.image.tag`| Image tag for openebs-zfs-plugin| `2.6.1-prerelease`|
| `zfsPlugin.image.tag`| Image tag for openebs-zfs-plugin| `2.6.2`|
niladrih marked this conversation as resolved.
Show resolved Hide resolved
| `zfsNode.allowedTopologyKeys`| Custom topology keys required for provisioning| `"kubernetes.io/hostname,"`|
| `zfsNode.driverRegistrar.image.registry`| Registry for csi-node-driver-registrar image| `registry.k8s.io/`|
| `zfsNode.driverRegistrar.image.repository`| Image repository for csi-node-driver-registrar| `sig-storage/csi-node-driver-registrar`|
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/charts/charts/crds/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ helm.sh/resource-policy: keep
{{- with .annotations }}
{{- toYaml . }}
{{- end }}
{{- end -}}
{{- end -}}
9 changes: 8 additions & 1 deletion deploy/helm/charts/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,11 @@ Enable zfsController containers leader election if replicas > 1
- "--leader-election"
{{- end }}
{{- end }}
{{- end }}
{{- end }}

{{/*
Ensure that the path to kubelet ends with a slash
*/}}
{{- define "zfslocalpv.zfsNode.kubeletDir" -}}
{{- printf "%s/" (.Values.zfsNode.kubeletDir | trimSuffix "/") -}}
{{- end }}
10 changes: 0 additions & 10 deletions deploy/helm/charts/templates/zfs-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,6 @@ spec:
{{ toYaml . | nindent 8 }}
{{- end}}
spec:
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: app
operator: In
values:
- openebs-zfs-controller
topologyKey: "kubernetes.io/hostname"
{{- if .Values.zfsController.priorityClass.create }}
priorityClassName: {{ template "zfslocalpv.zfsController.priorityClassName" . }}
{{- end }}
Expand Down
10 changes: 5 additions & 5 deletions deploy/helm/charts/templates/zfs-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: ADDRESS
value: /plugin/csi.sock
- name: DRIVER_REG_SOCK_PATH
value: {{ .Values.zfsNode.kubeletDir }}plugins/zfs-localpv/csi.sock
value: {{ printf "%s%s" (include "zfslocalpv.zfsNode.kubeletDir" .) "plugins/zfs-localpv/csi.sock" | quote }}
- name: KUBE_NODE_NAME
valueFrom:
fieldRef:
Expand Down Expand Up @@ -107,7 +107,7 @@ spec:
mountPropagation: "HostToContainer"
readOnly: true
- name: pods-mount-dir
mountPath: {{ .Values.zfsNode.kubeletDir }}
mountPath: {{ include "zfslocalpv.zfsNode.kubeletDir" . | quote }}
# needed so that any mounts setup inside this container are
# propagated back to the host machine.
mountPropagation: "Bidirectional"
Expand All @@ -130,15 +130,15 @@ spec:
type: Directory
- name: registration-dir
hostPath:
path: {{ .Values.zfsNode.kubeletDir }}plugins_registry/
path: {{ printf "%s%s" (include "zfslocalpv.zfsNode.kubeletDir" .) "plugins_registry/" | quote }}
type: DirectoryOrCreate
- name: plugin-dir
hostPath:
path: {{ .Values.zfsNode.kubeletDir }}plugins/zfs-localpv/
path: {{ printf "%s%s" (include "zfslocalpv.zfsNode.kubeletDir" .) "plugins/zfs-localpv/" | quote }}
type: DirectoryOrCreate
- name: pods-mount-dir
hostPath:
path: {{ .Values.zfsNode.kubeletDir }}
path: {{ include "zfslocalpv.zfsNode.kubeletDir" . | quote }}
type: Directory
{{- if .Values.zfsNode.additionalVolumes }}
{{- range $name, $config := .Values.zfsNode.additionalVolumes }}
Expand Down
Loading