diff --git a/README.md b/README.md index 9cc4c228..73be7862 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,10 @@ Check out the [quickstart guide](./docs/Usage.md#quick-start) for launching a cl ## Compatibility with Cluster API and Kubernetes Versions This provider's versions are compatible with the following versions of Cluster API: -| | Cluster API v1beta1 (v1.3) | Cluster API v1beta1 (v1.4) | Cluster API v1beta1 (v1.5) | Cluster API v1beta1 (v1.6) | -|------------------------|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:| -| CAPMOX v1alpha1 (v0.1) | ✓ | ✓ | ✓ | ☓ | +| | Cluster API v1beta1 (v1.4) | Cluster API v1beta1 (v1.5) | Cluster API v1beta1 (v1.6) | +|------------------------|:--------------------------:|:--------------------------:|:--------------------------:| +| CAPMOX v1alpha1 (v0.1) | ✓ | ✓ | ☓ | +| CAPMOX v1alpha1 (v0.2) | ☓ | ✓ | ✓ | (See [Kubernetes support matrix](https://cluster-api.sigs.k8s.io/reference/versions.html) of Cluster API versions). diff --git a/docs/Development.md b/docs/Development.md index ba31ecdd..13554d84 100644 --- a/docs/Development.md +++ b/docs/Development.md @@ -75,7 +75,6 @@ for more information. ``` - Change directory to cluster-api: `cd cluster-api`. This directory is the working directory for Tilt. -- Reset to tag `v1.5.3`. IPAM is not compatible with Cluster API 1.6.0 yet. - Create a file called `tilt-settings.json` with the following contents: ```json diff --git a/docs/Troubleshooting.md b/docs/Troubleshooting.md index e3c1d01f..8bdf4134 100644 --- a/docs/Troubleshooting.md +++ b/docs/Troubleshooting.md @@ -62,4 +62,4 @@ or others, please check the image tag of the `capi-controller-manager` Deploymen ``` kubectl get deployment/capi-controller-manager -o yaml | yq '.spec.template.spec.containers[].image' ``` -If your capi-controller is too new, you can pass a `--core cluster-api:v1.5.3` during `clusterctl init`, to force an older version. By default it installs the latest version from the [kubernetes-sigs/cluster-api](https://github.com/kubernetes-sigs/cluster-api) project. +If your capi-controller is too new, you can pass a `--core cluster-api:v1.6.1` during `clusterctl init`, to force an older version. By default it installs the latest version from the [kubernetes-sigs/cluster-api](https://github.com/kubernetes-sigs/cluster-api) project. diff --git a/docs/Usage.md b/docs/Usage.md index 11944226..f5cea301 100644 --- a/docs/Usage.md +++ b/docs/Usage.md @@ -112,7 +112,7 @@ the `EXP_CLUSTER_RESOURCE_SET` is required if you want to deploy CNI using clust Once you have access to a management cluster, you can initialize Cluster API with the following: ``` -clusterctl init --infrastructure proxmox --ipam in-cluster --core cluster-api:v1.5.3 +clusterctl init --infrastructure proxmox --ipam in-cluster --core cluster-api:v1.6.1 ``` ### Create a Workload Cluster