Skip to content

Commit d8d8984

Browse files
committed
Improve proxmox docs
1 parent 70753cf commit d8d8984

File tree

3 files changed

+32
-31
lines changed

3 files changed

+32
-31
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
### What works
3232

33-
- Creation of worker nodes on AWS, Digitalocean, Openstack, Azure, Google Cloud Platform, Nutanix, VMWare Cloud Director, VMWare Vsphere, Linode, Hetzner cloud and Kubevirt (experimental)
33+
- Creation of worker nodes on AWS, Digitalocean, Openstack, Azure, Google Cloud Platform, Nutanix, VMWare Cloud Director, VMWare Vsphere, Linode, Hetzner cloud, Kubevirt (technology preview) and Proxmox (technology preview)
3434
- Using Ubuntu, Flatcar or CentOS 7 distributions ([not all distributions work on all providers](/docs/operating-system.md))
3535

3636
### Supported Kubernetes versions

docs/operating-system.md

+22-21
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@
44

55
### Cloud provider
66

7-
| | Ubuntu | CentOS | Flatcar | RHEL | SLES | Amazon Linux 2 | Rocky Linux |
8-
|---|---|---|---|---|---|---|---|
9-
| AWS ||||||||
10-
| Azure ||||| x | x ||
11-
| Digitalocean ||| x | x | x | x ||
12-
| Equinix Metal |||| x | x | x ||
13-
| Google Cloud Platform || x | x | x | x | x | x |
14-
| Hetzner ||| x | x | x | x ||
15-
| KubeVirt ||||| x | x ||
16-
| Nutanix ||| x | x | x | x | x |
17-
| Openstack ||||| x | x ||
18-
| VMware Cloud Director || x | x | x | x | x | x |
19-
| VSphere ||||| x | x ||
7+
| | Ubuntu | CentOS | Flatcar | RHEL | SLES | Amazon Linux 2 | Rocky Linux |
8+
| --- | --- | --- | --- | --- | --- | --- | --- |
9+
| AWS ||||||||
10+
| Azure ||||| x | x ||
11+
| Digitalocean ||| x | x | x | x ||
12+
| Equinix Metal |||| x | x | x ||
13+
| Google Cloud Platform || x | x | x | x | x | x |
14+
| Hetzner ||| x | x | x | x ||
15+
| KubeVirt ||||| x | x ||
16+
| Nutanix ||| x | x | x | x | x |
17+
| Openstack ||||| x | x ||
18+
| Proxmox || x | x | x | x | x | x |
19+
| VMware Cloud Director || x | x | x | x | x | x |
20+
| VSphere ||||| x | x ||
2021

2122
## Configuring a operating system
2223

@@ -38,11 +39,11 @@ OS specific settings can be set via `machine.spec.providerConfig.operatingSystem
3839
Note that the table below lists the OS versions that we are validating in our automated tests.
3940
Machine controller may work with other OS versions that are not listed in the table but support won’t be provided.
4041

41-
| | Versions |
42-
|---|---|
43-
| AmazonLinux2 | 2.x |
44-
| CentOS | 7.4.x, 7.6.x, 7.7.x |
45-
| RHEL | 8.x |
46-
| Rocky Linux | 8.5 |
47-
| SLES | SLES 15 SP3 |
48-
| Ubuntu | 20.04 LTS, 22.04 LTS |
42+
| | Versions |
43+
| --- | --- |
44+
| AmazonLinux2 | 2.x |
45+
| CentOS | 7.4.x, 7.6.x, 7.7.x |
46+
| RHEL | 8.x |
47+
| Rocky Linux | 8.5 |
48+
| SLES | SLES 15 SP3 |
49+
| Ubuntu | 20.04 LTS, 22.04 LTS |

docs/proxmox.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ For the provider to properly function the user needs an API token with the follo
4242
* `Sys.Audit`
4343
* `Sys.Console`
4444

45-
### Cloud-Init enabled VM Templates
45+
### Cloud-init enabled VM Templates
4646

47-
Although it is possible to upload Cloud-Init images in Proxmox VE and create VM disks directly from
47+
Although it is possible to upload cloud-init images in Proxmox VE and create VM disks directly from
4848
these images via CLI tools on the nodes directly, there is no API endpoint yet to provide this
4949
functionality externally. That's why the `proxmox` provider assumes there are VM templates in place
5050
to clone new machines from.
5151

52-
Proxmox recommends using either ready-to-use Cloud-Init images provided by many Linux distributions
52+
Proxmox recommends using either ready-to-use cloud-init images provided by many Linux distributions
5353
(mostly designed for OpenStack) or to prepare the images yourself as you have full control over
5454
what's in these images.
5555

@@ -82,13 +82,13 @@ qm template $INSTANCE_ID
8282
ha-manager add vm:$INSTANCE_ID -state stopped
8383
```
8484

85-
### Cloud-Init user-data
85+
### Cloud-init user-data
8686

8787
Proxmox currently does not support the upload of "snippets" via API, but these snippets are used for
8888
cloud-init user-data which are required for the machine-controller to function. This provider
89-
implementation needs to copy the generated user-data yaml file to every proxmox node where a VM is
90-
created or migrated to.
89+
implementation needs to copy the generated user-data yaml file via SFTP to every proxmox node where
90+
a VM is created or migrated to. For this to work, make sure that:
9191

92-
* A storage needs to be enabled for content `snippets` (e.g. `local`)
93-
* SSH private key of a user that exists on all nodes and has write permission to the path where
94-
snippets are stored (e.g. `/var/lib/vz/snippets`)
92+
* A storage is enabled for content `snippets` (e.g. `local`)
93+
* You have the SSH private key of a user that exists on all nodes which has write permission to the
94+
path where snippets are stored (e.g. `/var/lib/vz/snippets`)

0 commit comments

Comments
 (0)