Skip to content

Commit 0fb108a

Browse files
authored
Merge pull request #2830 from randomvariable/readme-v1beta1
Update docs to v1beta1
2 parents 82f3c98 + 5e9760e commit 0fb108a

17 files changed

+90
-142
lines changed

README.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,25 @@ cluster on AWS.
5252

5353
This provider's versions are compatible with the following versions of Cluster API:
5454

55-
| | Cluster API v1alpha3 (v0.3) | Cluster API v1alpha4 (v0.4) |
56-
| ---------------------------- | --------------------------- | --------------------------- |
57-
| AWS Provider v1alpha3 (v0.5) || |
58-
| AWS Provider v1alpha3 (v0.6) || |
59-
| AWS Provider v1alpha4 (v0.7) | ||
55+
56+
| | v1alpha3 (v0.3) | v1alpha4 (v0.4) | v1beta1 (v1.0) |
57+
| ---------------------------- | --------------- | --------------- | -------------- |
58+
| AWS Provider v1alpha3 (v0.5) || | |
59+
| AWS Provider v1alpha3 (v0.6) || | |
60+
| AWS Provider v1alpha4 (v0.7) | || |
61+
| AWS Provider v1beta1 (v1.0) | | ||
6062

6163

6264
This provider's versions are able to install and manage the following versions of Kubernetes:
6365

64-
| | Kubernetes 1.16 | Kubernetes 1.17 | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 |
65-
| ---------------------------- | --------------- | --------------- | --------------- | --------------- | --------------- | --------------- |
66-
| AWS Provider v1alpha3 (v0.5) |||||| |
67-
| AWS Provider v1alpha3 (v0.6) |||||||
68-
| AWS Provider v1alpha4 (v0.7) | | | ||||
66+
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 |
67+
| ---------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- |
68+
| AWS Provider v1alpha3 (v0.5) |||||| | |
69+
| AWS Provider v1alpha3 (v0.6) |||||||* |
70+
| AWS Provider v1alpha4 (v0.7) | | |* |||||
71+
| AWS Provider v1beta1 (v1.0) | | | |||||
6972

73+
\* Not management clusters
7074

7175
Each version of Cluster API for AWS will attempt to support two Kubernetes versions; e.g., Cluster API for AWS `v0.3` supports Kubernetes 1.16, 1.17, 1.18 etc.
7276

docs/book/gen-crd-api-reference-docs/config.json

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,17 @@
1919
"typeMatchPrefix": "^k8s\\.io/(api|apimachinery/pkg/apis)/",
2020
"docsURLTemplate": "https://v1-18.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#{{lower .TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments -2}}"
2121
},
22-
{
23-
"typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api-provider-aws/cmd/clusterawsadm/api/iam",
24-
"docsURLTemplate": "https://cluster-api-aws.sigs.k8s.io/crd/clusterawsadm.html#iam.aws.infrastructure.cluster.x-k8s.io/v1alpha1.{{.TypeIdentifier}}"
25-
},
26-
{
27-
"typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api-provider-aws/api/v1alpha3",
28-
"docsURLTemplate": "https://cluster-api-aws.sigs.k8s.io/crd/cluster-api-aws.html#infrastructure.cluster.x-k8s.io/v1alpha3.{{.TypeIdentifier}}"
29-
},
30-
{
31-
"typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api-provider-aws/api/v1alpha4",
32-
"docsURLTemplate": "https://cluster-api-aws.sigs.k8s.io/crd/cluster-api-aws.html#infrastructure.cluster.x-k8s.io/v1alpha4.{{.TypeIdentifier}}"
33-
},
3422
{
3523
"typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api/api/v1alpha3",
36-
"docsURLTemplate": "https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v0.3.15"
24+
"docsURLTemplate": "https://doc.crds.dev/github.com/kubernetes-sigs/cluster-api@v1.0.0"
3725
},
3826
{
3927
"typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api/api/v1alpha4",
40-
"docsURLTemplate": "https://doc.crds.dev/github.com/kubernetes-sigs/[email protected]"
28+
"docsURLTemplate": "https://doc.crds.dev/github.com/kubernetes-sigs/[email protected]"
29+
},
30+
{
31+
"typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api/api/v1beta1",
32+
"docsURLTemplate": "https://doc.crds.dev/github.com/kubernetes-sigs/[email protected]"
4133
},
4234
{
4335
"typeMatchPrefix": "^sigs\\.k8s\\.io/cluster-api/api/v1beta1",

0 commit comments

Comments
 (0)