openstack/magnum-capi-helm-charts
Code Issues Proposed changes

Add more support for specifying compute + volume AZs

Browse Source
This commit is contained in:
Matt Pryor 2022-05-31 11:52:46 +01:00
parent b6a660ba12
commit 8c3da0bd74
4 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/openstack-cluster/templates/cluster-openstack.yaml
View File

@ -44,3 +44,6 @@ spec:
{{- end }}
apiServerPort: {{ .port }}
{{- end }}
{{- with .Values.controlPlane.failureDomains }}
controlPlaneAvailabilityZones: {{ toYaml . | nindent 4 }}
{{- end }}

5
charts/openstack-cluster/templates/control-plane/openstack-machine-template.yaml
View File

@ -13,9 +13,8 @@ template:
{{- with .Values.machineSSHKeyName }}
sshKeyName: {{ . }}
{{- end }}
{{- if gt (float64 .Values.controlPlane.machineRootVolumeSize) 0.0 }}
rootVolume:
diskSize: {{ .Values.controlPlane.machineRootVolumeSize }}
{{- with .Values.controlPlane.machineRootVolume }}
rootVolume: {{ toYaml . | nindent 6 }}
{{- end }}
{{- if .Values.machineImageId }}
imageUUID: {{ .Values.machineImageId }}

5
charts/openstack-cluster/templates/node-group/openstack-machine-template.yaml
View File

@ -15,9 +15,8 @@ template:
{{- with $ctx.Values.machineSSHKeyName }}
sshKeyName: {{ . }}
{{- end }}
{{- if gt (float64 $nodeGroup.machineRootVolumeSize) 0.0 }}
rootVolume:
diskSize: {{ $nodeGroup.machineRootVolumeSize }}
{{- with $nodeGroup.machineRootVolume }}
rootVolume: {{ toYaml . | nindent 6 }}
{{- end }}
{{- if $ctx.Values.machineImageId }}
imageUUID: {{ $ctx.Values.machineImageId }}

32
charts/openstack-cluster/values.yaml
View File

@ -91,6 +91,10 @@ apiServer:
# Settings for the control plane
controlPlane:
# The failure domains to use for control plane nodes
# If given, should be a list of availability zones
# If not given, all availability zones will be considered for control plane nodes
failureDomains:
# The number of control plane machines to deploy
# For high-availability, this should be greater than 1
# For etcd quorum, it should be odd - usually 3, or 5 for very large clusters
@ -103,9 +107,17 @@ controlPlane:
machineNetworking:
networks:
ports:
# The root volume size for the machine
# If greater than zero, a volume is provisioned to be the root disk for the machine
machineRootVolumeSize: 0
# The root volume spec for control plane machines
# If not given, the ephemeral root disk from the flavor is used
machineRootVolume:
# # The size of the disk to use
# diskSize:
# # The volume type to use
# # If not specified, the default volume type is used
# volumeType:
# # The volume availability zone to use
# # If not specified, the machine availability zone is used
# availabilityZone:
# The time to wait for a node to finish draining before it can be removed
nodeDrainTimeout: 5m
# The rollout strategy to use for the control plane nodes
@ -183,9 +195,17 @@ nodeGroupDefaults:
machineNetworking:
networks:
ports:
# The root volume size for the machine
# If greater than zero, a volume is provisioned to be the root disk for the machine
machineRootVolumeSize: 0
# The root volume spec for machines in the node group
# If not given, the ephemeral root disk from the flavor is used
machineRootVolume:
# # The size of the disk to use
# diskSize:
# # The volume type to use
# # If not specified, the default volume type is used
# volumeType:
# # The volume availability zone to use
# # If not specified, the machine availability zone is used
# availabilityZone:
# The time to wait for a node to finish draining before it can be removed
nodeDrainTimeout: 5m
# The rollout strategy to use for the node group