Skip to content

Commit

Permalink
Fix removeSnapshotsDuringFilesystemTrim not being used in helm chart
Browse files Browse the repository at this point in the history
Also ran `./scripts/generate-longhorn-yaml.sh`

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
(cherry picked from commit 5e47f97)
  • Loading branch information
yardenshoham authored and innobead committed Feb 22, 2024
1 parent bcec105 commit 3382579
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
3 changes: 3 additions & 0 deletions chart/templates/storageclass.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,6 @@ data:
{{- if .Values.persistence.defaultNodeSelector.enable }}
nodeSelector: "{{ .Values.persistence.defaultNodeSelector.selector }}"
{{- end }}
{{- if .Values.persistence.removeSnapshotsDuringFilesystemTrim }}
unmapMarkSnapChainRemoved: "{{ .Values.persistence.removeSnapshotsDuringFilesystemTrim }}"
{{- end }}
29 changes: 15 additions & 14 deletions deploy/longhorn.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ kind: Namespace
metadata:
name: longhorn-system
---
# Source: longhorn/templates/priorityclass.yaml
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: "longhorn-critical"
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.6.0
description: "Ensure Longhorn pods have the highest priority to prevent any unexpected eviction by the Kubernetes scheduler under node pressure"
globalDefault: false
preemptionPolicy: PreemptLowerPriority
value: 1000000000
---
# Source: longhorn/templates/serviceaccount.yaml
apiVersion: v1
kind: ServiceAccount
Expand Down Expand Up @@ -80,6 +94,7 @@ data:
fromBackup: ""
fsType: "ext4"
dataLocality: "disabled"
unmapMarkSnapChainRemoved: "ignored"
---
# Source: longhorn/templates/crds.yaml
apiVersion: apiextensions.k8s.io/v1
Expand Down Expand Up @@ -4566,17 +4581,3 @@ spec:
---
# Source: longhorn/templates/validate-psp-install.yaml
#
---
# Source: longhorn/templates/priorityclass.yaml
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: "longhorn-critical"
labels:
app.kubernetes.io/name: longhorn
app.kubernetes.io/instance: longhorn
app.kubernetes.io/version: v1.6.0
description: "Ensure Longhorn pods have the highest priority to prevent any unexpected eviction by the Kubernetes scheduler under node pressure"
globalDefault: false
preemptionPolicy: PreemptLowerPriority
value: 1000000000

0 comments on commit 3382579

Please sign in to comment.