diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 94ad7700..4f9565b5 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -144,7 +144,8 @@ virtual-machine 0.9.0 721c12a7 virtual-machine 0.9.1 93bdf411 virtual-machine 0.10.0 6130f43d virtual-machine 0.10.2 632224a3 -virtual-machine 0.11.0 HEAD +virtual-machine 0.11.0 4369b031 +virtual-machine 0.12.0 HEAD vm-disk 0.1.0 d971f2ff vm-disk 0.1.1 6130f43d vm-disk 0.1.2 632224a3 @@ -159,7 +160,8 @@ vm-instance 0.5.1 de19450f vm-instance 0.6.0 721c12a7 vm-instance 0.7.0 6130f43d vm-instance 0.7.2 632224a3 -vm-instance 0.8.0 HEAD +vm-instance 0.8.0 4369b031 +vm-instance 0.9.0 HEAD vpn 0.1.0 263e47be vpn 0.2.0 53f2365e vpn 0.3.0 6c5cf5bf diff --git a/packages/apps/virtual-machine/Chart.yaml b/packages/apps/virtual-machine/Chart.yaml index c40f6e27..2550f4e3 100644 --- a/packages/apps/virtual-machine/Chart.yaml +++ b/packages/apps/virtual-machine/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.11.0 +version: 0.12.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/virtual-machine/README.md b/packages/apps/virtual-machine/README.md index 8c9b382c..a1a89bdc 100644 --- a/packages/apps/virtual-machine/README.md +++ b/packages/apps/virtual-machine/README.md @@ -50,6 +50,7 @@ virtctl ssh @ | `gpus` | List of GPUs to attach | `[]` | | `resources.cpu` | The number of CPU cores allocated to the virtual machine | `""` | | `resources.memory` | The amount of memory allocated to the virtual machine | `""` | +| `resources.sockets` | The number of CPU sockets allocated to the virtual machine (used to define vCPU topology) | `""` | | `sshKeys` | List of SSH public keys for authentication. Can be a single key or a list of keys. | `[]` | | `cloudInit` | cloud-init user data config. See cloud-init documentation for more details. | `""` | | `cloudInitSeed` | A seed string to generate an SMBIOS UUID for the VM. | `""` | diff --git a/packages/apps/virtual-machine/templates/vm.yaml b/packages/apps/virtual-machine/templates/vm.yaml index 1ef8a3ea..3bf99166 100644 --- a/packages/apps/virtual-machine/templates/vm.yaml +++ b/packages/apps/virtual-machine/templates/vm.yaml @@ -60,9 +60,10 @@ spec: {{- include "virtual-machine.labels" . | nindent 8 }} spec: domain: - {{- if and .Values.resources .Values.resources.cpu }} + {{- if and .Values.resources .Values.resources.cpu .Values.resources.sockets }} cpu: cores: {{ .Values.resources.cpu }} + sockets: {{ .Values.resources.sockets }} {{- end }} {{- if and .Values.resources .Values.resources.memory }} resources: diff --git a/packages/apps/virtual-machine/values.schema.json b/packages/apps/virtual-machine/values.schema.json index ea0efd4c..55127ca1 100644 --- a/packages/apps/virtual-machine/values.schema.json +++ b/packages/apps/virtual-machine/values.schema.json @@ -184,6 +184,11 @@ "type": "string", "description": "The amount of memory allocated to the virtual machine", "default": "" + }, + "sockets": { + "type": "string", + "description": "The number of CPU sockets allocated to the virtual machine (used to define vCPU topology)", + "default": "" } } }, diff --git a/packages/apps/virtual-machine/values.yaml b/packages/apps/virtual-machine/values.yaml index 191a86a5..116e8ab3 100644 --- a/packages/apps/virtual-machine/values.yaml +++ b/packages/apps/virtual-machine/values.yaml @@ -34,9 +34,11 @@ gpus: [] ## @param resources.cpu The number of CPU cores allocated to the virtual machine ## @param resources.memory The amount of memory allocated to the virtual machine +## @param resources.sockets The number of CPU sockets allocated to the virtual machine (used to define vCPU topology) resources: cpu: "" memory: "" + sockets: "" ## @param sshKeys [array] List of SSH public keys for authentication. Can be a single key or a list of keys. ## Example: diff --git a/packages/apps/vm-instance/Chart.yaml b/packages/apps/vm-instance/Chart.yaml index 962ff161..7b53ff1d 100644 --- a/packages/apps/vm-instance/Chart.yaml +++ b/packages/apps/vm-instance/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.0 +version: 0.9.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/vm-instance/README.md b/packages/apps/vm-instance/README.md index 611595a0..6971ad54 100644 --- a/packages/apps/vm-instance/README.md +++ b/packages/apps/vm-instance/README.md @@ -36,21 +36,22 @@ virtctl ssh @ ### Common parameters -| Name | Description | Value | -| ------------------ | ---------------------------------------------------------------------------------------------------------- | ----------- | -| `external` | Enable external access from outside the cluster | `false` | -| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `PortList` | -| `externalPorts` | Specify ports to forward from outside the cluster | `[]` | -| `running` | Determines if the virtual machine should be running | `true` | -| `instanceType` | Virtual Machine instance type | `u1.medium` | -| `instanceProfile` | Virtual Machine preferences profile | `ubuntu` | -| `disks` | List of disks to attach | `[]` | -| `gpus` | List of GPUs to attach | `[]` | -| `resources.cpu` | The number of CPU cores allocated to the virtual machine | `""` | -| `resources.memory` | The amount of memory allocated to the virtual machine | `""` | -| `sshKeys` | List of SSH public keys for authentication. Can be a single key or a list of keys. | `[]` | -| `cloudInit` | cloud-init user data config. See cloud-init documentation for more details. | `""` | -| `cloudInitSeed` | A seed string to generate an SMBIOS UUID for the VM. | `""` | +| Name | Description | Value | +| ------------------- | ---------------------------------------------------------------------------------------------------------- | ----------- | +| `external` | Enable external access from outside the cluster | `false` | +| `externalMethod` | specify method to passthrough the traffic to the virtual machine. Allowed values: `WholeIP` and `PortList` | `PortList` | +| `externalPorts` | Specify ports to forward from outside the cluster | `[]` | +| `running` | Determines if the virtual machine should be running | `true` | +| `instanceType` | Virtual Machine instance type | `u1.medium` | +| `instanceProfile` | Virtual Machine preferences profile | `ubuntu` | +| `disks` | List of disks to attach | `[]` | +| `gpus` | List of GPUs to attach | `[]` | +| `resources.cpu` | The number of CPU cores allocated to the virtual machine | `""` | +| `resources.memory` | The amount of memory allocated to the virtual machine | `""` | +| `resources.sockets` | The number of CPU sockets allocated to the virtual machine (used to define vCPU topology) | `""` | +| `sshKeys` | List of SSH public keys for authentication. Can be a single key or a list of keys. | `[]` | +| `cloudInit` | cloud-init user data config. See cloud-init documentation for more details. | `""` | +| `cloudInitSeed` | A seed string to generate an SMBIOS UUID for the VM. | `""` | ## U Series diff --git a/packages/apps/vm-instance/templates/vm.yaml b/packages/apps/vm-instance/templates/vm.yaml index a99492f0..e11da732 100644 --- a/packages/apps/vm-instance/templates/vm.yaml +++ b/packages/apps/vm-instance/templates/vm.yaml @@ -31,9 +31,10 @@ spec: {{- include "virtual-machine.labels" . | nindent 8 }} spec: domain: - {{- if and .Values.resources .Values.resources.cpu }} + {{- if and .Values.resources .Values.resources.cpu .Values.resources.sockets }} cpu: cores: {{ .Values.resources.cpu }} + sockets: {{ .Values.resources.sockets }} {{- end }} {{- if and .Values.resources .Values.resources.memory }} resources: diff --git a/packages/apps/vm-instance/values.schema.json b/packages/apps/vm-instance/values.schema.json index 8ce71cdb..4711c633 100644 --- a/packages/apps/vm-instance/values.schema.json +++ b/packages/apps/vm-instance/values.schema.json @@ -165,6 +165,11 @@ "type": "string", "description": "The amount of memory allocated to the virtual machine", "default": "" + }, + "sockets": { + "type": "string", + "description": "The number of CPU sockets allocated to the virtual machine (used to define vCPU topology)", + "default": "" } } }, diff --git a/packages/apps/vm-instance/values.yaml b/packages/apps/vm-instance/values.yaml index 4b21423d..f999b923 100644 --- a/packages/apps/vm-instance/values.yaml +++ b/packages/apps/vm-instance/values.yaml @@ -32,9 +32,11 @@ gpus: [] ## @param resources.cpu The number of CPU cores allocated to the virtual machine ## @param resources.memory The amount of memory allocated to the virtual machine +## @param resources.sockets The number of CPU sockets allocated to the virtual machine (used to define vCPU topology) resources: cpu: "" memory: "" + sockets: "" ## @param sshKeys [array] List of SSH public keys for authentication. Can be a single key or a list of keys. ## Example: