Skip to content

Commit

Permalink
chart: rename backendStoreDriver to dataEngine
Browse files Browse the repository at this point in the history 
Longhorn 7095

Signed-off-by: Derek Su <derek.su@suse.com>
  • Loading branch information
@derekbit
derekbit authored and David Ko committed Dec 29, 2023
1 parent 470c5e2 commit 38fa709
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 42 deletions.
58 changes: 44 additions & 14 deletions chart/templates/crds.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1277,6 +1277,10 @@ spec:
subresources:
status: {}
- additionalPrinterColumns:
- description: The data engine of the engine
jsonPath: .spec.dataEngine
name: Data Engine
type: string
- description: The current state of the engine
jsonPath: .status.currentState
name: State
Expand Down Expand Up @@ -1315,12 +1319,15 @@ spec:
active:
type: boolean
backendStoreDriver:
description: 'Deprecated: Replaced by field `dataEngine`.'
type: string
backupVolume:
type: string
dataEngine:
enum:
- v1
- v2
type: string
backupVolume:
type: string
desireState:
type: string
disableFrontend:
Expand Down Expand Up @@ -1627,6 +1634,10 @@ spec:
subresources:
status: {}
- additionalPrinterColumns:
- description: The data engine of the instance manager
jsonPath: .spec.dataEngine
name: Data Engine
type: string
- description: The state of the instance manager
jsonPath: .status.currentState
name: State
Expand All @@ -1635,10 +1646,6 @@ spec:
jsonPath: .spec.type
name: Type
type: string
- description: The data engine of the instance manager
jsonPath: .spec.backendStoreDriver
name: Data Engine
type: string
- description: The node that the instance manager is running on
jsonPath: .spec.nodeID
name: Node
Expand All @@ -1660,9 +1667,9 @@ spec:
metadata:
type: object
spec:
description: InstanceManagerSpec defines the desired state of the Longhorn instancer manager
description: InstanceManagerSpec defines the desired state of the Longhorn instance manager
properties:
backendStoreDriver:
dataEngine:
type: string
image:
type: string
Expand Down Expand Up @@ -1694,6 +1701,9 @@ spec:
spec:
properties:
backendStoreDriver:
description: 'Deprecated: Replaced by field `dataEngine`.'
type: string
dataEngine:
type: string
name:
type: string
Expand Down Expand Up @@ -1733,6 +1743,9 @@ spec:
spec:
properties:
backendStoreDriver:
description: 'Deprecated: Replaced by field `dataEngine`.'
type: string
dataEngine:
type: string
name:
type: string
Expand Down Expand Up @@ -1772,6 +1785,9 @@ spec:
spec:
properties:
backendStoreDriver:
description: 'Deprecated: Replaced by field `dataEngine`.'
type: string
dataEngine:
type: string
name:
type: string
Expand Down Expand Up @@ -2403,6 +2419,10 @@ spec:
subresources:
status: {}
- additionalPrinterColumns:
- description: The data engine of the replica
jsonPath: .spec.dataEngine
name: Data Engine
type: string
- description: The current state of the replica
jsonPath: .status.currentState
name: State
Expand Down Expand Up @@ -2445,14 +2465,17 @@ spec:
active:
type: boolean
backendStoreDriver:
enum:
- v1
- v2
description: 'Deprecated: Replaced by field `dataEngine`.'
type: string
backingImage:
type: string
dataDirectoryName:
type: string
dataEngine:
enum:
- v1
- v2
type: string
desireState:
type: string
diskID:
Expand Down Expand Up @@ -3300,6 +3323,10 @@ spec:
subresources:
status: {}
- additionalPrinterColumns:
- description: The data engine of the volume
jsonPath: .spec.dataEngine
name: Data Engine
type: string
- description: The state of the volume
jsonPath: .status.state
name: State
Expand Down Expand Up @@ -3347,9 +3374,7 @@ spec:
- rwx
type: string
backendStoreDriver:
enum:
- v1
- v2
description: 'Deprecated: Replaced by field `dataEngine`.'
type: string
backingImage:
type: string
Expand All @@ -3359,6 +3384,11 @@ spec:
- lz4
- gzip
type: string
dataEngine:
enum:
- v1
- v2
type: string
dataLocality:
enum:
- disabled
Expand Down
82 changes: 56 additions & 26 deletions deploy/longhorn.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,6 @@ 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-dev
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 @@ -1406,6 +1392,10 @@ spec:
subresources:
status: {}
- additionalPrinterColumns:
- description: The data engine of the engine
jsonPath: .spec.dataEngine
name: Data Engine
type: string
- description: The current state of the engine
jsonPath: .status.currentState
name: State
Expand Down Expand Up @@ -1444,12 +1434,15 @@ spec:
active:
type: boolean
backendStoreDriver:
description: Deprecated.
type: string
backupVolume:
type: string
dataEngine:
enum:
- v1
- v2
type: string
backupVolume:
type: string
desireState:
type: string
disableFrontend:
Expand Down Expand Up @@ -1760,6 +1753,10 @@ spec:
subresources:
status: {}
- additionalPrinterColumns:
- description: The data engine of the instance manager
jsonPath: .spec.dataEngine
name: Data Engine
type: string
- description: The state of the instance manager
jsonPath: .status.currentState
name: State
Expand All @@ -1768,10 +1765,6 @@ spec:
jsonPath: .spec.type
name: Type
type: string
- description: The data engine of the instance manager
jsonPath: .spec.backendStoreDriver
name: Data Engine
type: string
- description: The node that the instance manager is running on
jsonPath: .spec.nodeID
name: Node
Expand All @@ -1796,6 +1789,9 @@ spec:
description: InstanceManagerSpec defines the desired state of the Longhorn instancer manager
properties:
backendStoreDriver:
description: Deprecated.
type: string
dataEngine:
type: string
image:
type: string
Expand Down Expand Up @@ -1827,6 +1823,9 @@ spec:
spec:
properties:
backendStoreDriver:
description: Deprecated.
type: string
dataEngine:
type: string
name:
type: string
Expand Down Expand Up @@ -1866,6 +1865,9 @@ spec:
spec:
properties:
backendStoreDriver:
description: Deprecated.
type: string
dataEngine:
type: string
name:
type: string
Expand Down Expand Up @@ -2549,6 +2551,10 @@ spec:
subresources:
status: {}
- additionalPrinterColumns:
- description: The data engine of the replica
jsonPath: .spec.dataEngine
name: Data Engine
type: string
- description: The current state of the replica
jsonPath: .status.currentState
name: State
Expand Down Expand Up @@ -2591,14 +2597,17 @@ spec:
active:
type: boolean
backendStoreDriver:
enum:
- v1
- v2
description: Deprecated.
type: string
backingImage:
type: string
dataDirectoryName:
type: string
dataEngine:
enum:
- v1
- v2
type: string
desireState:
type: string
diskID:
Expand Down Expand Up @@ -3474,6 +3483,10 @@ spec:
subresources:
status: {}
- additionalPrinterColumns:
- description: The data engine of the volume
jsonPath: .spec.dataEngine
name: Data Engine
type: string
- description: The state of the volume
jsonPath: .status.state
name: State
Expand Down Expand Up @@ -3521,9 +3534,7 @@ spec:
- rwx
type: string
backendStoreDriver:
enum:
- v1
- v2
description: Deprecated.
type: string
backingImage:
type: string
Expand All @@ -3533,6 +3544,11 @@ spec:
- lz4
- gzip
type: string
dataEngine:
enum:
- v1
- v2
type: string
dataLocality:
enum:
- disabled
Expand Down Expand Up @@ -4372,3 +4388,17 @@ 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-dev
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
2 changes: 1 addition & 1 deletion enhancements/20230523-support-spdk-volumes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ By incorporating SPDK, Longhorn leverages its capabilities to significantly impr
staleReplicaTimeout: "2880"
fromBackup: ""
fsType: "ext4"
backendStoreDriver: "v2"
dataEngine: "v2"
```

- Create workloads that use Longhorn volumes provisioning based on the storage class.
Expand Down
2 changes: 1 addition & 1 deletion examples/v2/storageclass.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:
numberOfReplicas: "3"
staleReplicaTimeout: "2880"
fsType: "ext4"
backendStoreDriver: "v2"
dataEngine: "v2"
# mkfsParams: "-I 256 -b 4096 -O ^metadata_csum,^64bit"
# nodeSelector: "storage,fast"
# recurringJobSelector: '[{"name":"snap-group", "isGroup":true},
Expand Down

0 comments on commit 38fa709

Please sign in to comment.