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

Make rootVolume dependent on disk size being specified (#54)

Browse Source 
* Make rootVolume dependent on disk size being specified

* Fix linting issues
This commit is contained in:
Matt Pryor 2023-07-13 10:54:12 +01:00 committed by GitHub
parent b3b282caaa
commit 86cc717bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,8 +13,8 @@ template:
{{- with .Values.machineSSHKeyName }}
sshKeyName: {{ . }}
{{- end }}
{{- with .Values.controlPlane.machineRootVolume }}
rootVolume: {{ toYaml . | nindent 6 }}
{{- if .Values.controlPlane.machineRootVolume.diskSize }}
rootVolume: {{ toYaml .Values.controlPlane.machineRootVolume | nindent 6 }}
{{- end }}
{{- if .Values.machineImageId }}
imageUUID: {{ .Values.machineImageId }}

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

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

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

@ -140,15 +140,15 @@ controlPlane:
networks:
ports:
# 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
# The size of the disk to use
# If not given, the ephemeral root disk from the flavor is used
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
# 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: 5m0s
@ -229,15 +229,15 @@ nodeGroupDefaults:
networks:
ports:
# 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
# The size of the disk to use
# If not given, the ephemeral root disk from the flavor is used
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
# 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: 5m0s