Skip to content

Add optional availabilityZone.from:Machine to disks. #263

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

Open
garloff wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add optional availabilityZone.from:Machine to disks. #263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fe4580
Add optional availabilityZone.from:Machine to disks.
garloff Apr 24, 2026
6ee7609
Merge branch 'main' into feat/support-multi-az-volumepin
garloff Apr 29, 2026
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
111 changes: 108 additions & 3 deletions providers/openstack/scs2/cluster-class/templates/cluster-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,19 @@ spec:
Root disk size in GiB for control-plane nodes.
OpenStack volume will be created and used instead of an ephemeral disk defined in flavor.
Should only be used for the diskless flavors (>= 20), otherwise set to 0.
- name: controlPlaneRootDiskPin
required: false
schema:
openAPIV3Schema:
type: boolean
example: true
default: false
description: |-
Pass availabilityZone (failureDomain) of the worker machine to the root disk.
Some clouds have a 1:1 relationship of storage availability zones with compute AZs.
In these, attaching a disk from another AZ often comes with a performance penalty
or is not possible at all. You want to set to true to tell capo to create the root
disk in the stated failureDomain of this machine deployment.
- name: controlPlaneServerGroupID
required: false
schema:
Expand Down Expand Up @@ -180,6 +193,19 @@ spec:
Root disk size in GiB for worker nodes.
OpenStack volume will be created and used instead of an ephemeral disk defined in flavor.
Should be used for the diskless flavors (>= 20), otherwise set to 0.
- name: workerRootDiskPin
required: false
schema:
openAPIV3Schema:
type: boolean
example: true
default: false
description: |-
Pass availabilityZone (failureDomain) of the machine to the root disk.
Some clouds have a 1:1 relationship of storage availability zones with compute AZs.
In these, attaching a disk from another AZ often comes with a performance penalty
or is not possible at all. You want to set to true to tell capo to create the root
disk in the wanted AZ of the machine.
- name: workerServerGroupID
required: false
schema:
Expand All @@ -193,6 +219,9 @@ spec:
schema:
openAPIV3Schema:
type: array
description: |-
You may pass an array with additional volumes (disks) here, consisting of
name, sizeGiB (default: 20) and type (aka storage class, default: __DEFAULT__).
default: []
items:
type: object
Expand All @@ -206,6 +235,19 @@ spec:
type: string
default: "__DEFAULT__"
required: ["name"]
- name: workerAdditionalBlockDevicesPin
required: false
schema:
openAPIV3Schema:
type: boolean
example: true
default: false
description: |-
Pass availabilityZone (failureDomain) of the machine to the additional disks.
Some clouds have a 1:1 relationship of storage availability zones with compute AZs.
In these, attaching a disk from another AZ often comes with a performance penalty
or is not possible at all. You want to set to true to tell capo to create the
additional disks in the wanted AZ of the machine.
# Access management
- name: sshKeyName
required: false
Expand Down Expand Up @@ -570,7 +612,22 @@ spec:
variable: controlPlaneFlavor
- name: controlPlaneRootDisk
description: "Sets the root disk size in GiB for control-plane nodes."
enabledIf: {{ `'{{ if .controlPlaneRootDisk }}true{{end}}'` }}
enabledIf: {{ `'{{ if and .controlPlaneRootDisk (not .controlPlaneRootDiskPin) }}true{{end}}'` }}
definitions:
- selector:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: OpenStackMachineTemplate
matchResources:
controlPlane: true
jsonPatches:
- op: add
path: "/spec/template/spec/rootVolume"
valueFrom:
template: |
sizeGiB: {{ `{{ .controlPlaneRootDisk }}` }}
- name: controlPlaneRootDiskPinned
description: "Sets the root disk size in GiB for control-plane nodes and pins them to the failureDomain of the machine."
enabledIf: {{ `'{{ if and .controlPlaneRootDisk .controlPlaneRootDiskPin }}true{{end}}'` }}
definitions:
- selector:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand All @@ -583,6 +640,8 @@ spec:
valueFrom:
template: |
sizeGiB: {{ `{{ .controlPlaneRootDisk }}` }}
availabilityZone:
from: Machine
- name: controlPlaneServerGroupID
description: "Sets the server group to assign the control plane nodes to."
enabledIf: {{ `'{{ ne .controlPlaneServerGroupID "" }}'` }}
Expand Down Expand Up @@ -697,7 +756,7 @@ spec:
variable: workerFlavor
- name: workerRootDisk
description: "Sets the root disk size in GiB for worker nodes."
enabledIf: {{ `'{{ if .workerRootDisk }}true{{end}}'` }}
enabledIf: {{ `'{{ if and .workerRootDisk (not .workerRootDiskPin) }}true{{end}}'` }}
definitions:
- selector:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand All @@ -713,6 +772,26 @@ spec:
valueFrom:
template: |
sizeGiB: {{ `{{ .workerRootDisk }}` }}
- name: workerRootDiskPinned
description: "Sets the root disk size in GiB for worker nodes and pins the to the AZ of the machine."
enabledIf: {{ `'{{ if and .workerRootDisk .workerRootDiskPin }}true{{end}}'` }}
definitions:
- selector:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: OpenStackMachineTemplate
matchResources:
controlPlane: false
machineDeploymentClass:
names:
- default-worker
jsonPatches:
- op: add
path: "/spec/template/spec/rootVolume"
valueFrom:
template: |
sizeGiB: {{ `{{ .workerRootDisk }}` }}
availabilityZone:
from: Machine
- name: workerServerGroupID
description: "Sets the server group to assign the worker nodes to."
enabledIf: {{ `'{{ ne .workerServerGroupID "" }}'` }}
Expand All @@ -732,7 +811,31 @@ spec:
template: |
id: {{ `{{ .workerServerGroupID }}` }}
- name: workerAdditionalBlockDevices
enabledIf: {{ `'{{ if .workerAdditionalBlockDevices }}true{{end}}'` }}
enabledIf: {{ `'{{ if and .workerAdditionalBlockDevices (not .workerAdditionalBlockDevicesPin) }}true{{end}}'` }}
definitions:
- selector:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: OpenStackMachineTemplate
matchResources:
controlPlane: false
machineDeploymentClass:
names:
- default-worker
jsonPatches:
- op: add
path: /spec/template/spec/additionalBlockDevices
valueFrom:
template: |
{{ `{{- range .workerAdditionalBlockDevices }}` }}
- name: {{ `{{ .name }}` }}
sizeGiB: {{ `{{ .sizeGiB }}` }}
storage:
type: Volume
volume:
type: {{ `{{ .type }}` }}
{{ `{{- end }}` }}
- name: workerAdditionalBlockDevicesPinned
enabledIf: {{ `'{{ if and .workerAdditionalBlockDevices .workerAdditionalBlockDevicesPin }}true{{end}}'` }}
definitions:
- selector:
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
Expand All @@ -750,6 +853,8 @@ spec:
{{ `{{- range .workerAdditionalBlockDevices }}` }}
- name: {{ `{{ .name }}` }}
sizeGiB: {{ `{{ .sizeGiB }}` }}
availabilityZone:
from: Machine
storage:
type: Volume
volume:
Expand Down
Loading