From affc1d96ff3b5179df3fdd82e369e5d14875f952 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Tue, 8 Mar 2022 16:52:50 +0100 Subject: [PATCH] book: add support deadlines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- .gitignore | 4 +++- CONTRIBUTING.md | 11 ++++++----- .../architecture/controllers/cluster-topology.md | 2 +- .../providers/implementers-guide/configure.md | 2 +- .../cluster-class/change-clusterclass.md | 2 +- .../experimental-features/cluster-class/index.md | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 3672d0053cd1..3fecc4d01a67 100644 --- a/.gitignore +++ b/.gitignore @@ -61,6 +61,8 @@ vendor # User-supplied Tiltfile extensions, settings, and builds tilt.d tilt-settings.json +tilt-settings.yaml +tilt_modules .tiltbuild # User-supplied clusterctl hacks settings @@ -74,4 +76,4 @@ out _releasenotes # Helm -.helm \ No newline at end of file +.helm diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4eaa7ca20fdc..be050b267c70 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -111,11 +111,12 @@ this should generally not be the case. Cluster API maintains the most recent release branch for all supported API and contract versions. Support for this section refers to the ability to backport and release patch versions. -| API Version | Branch | Supported Until | -| ------------- | ----------- | ---------- | -| **v1beta1** | release-1.0 | current stable | -| **v1alpha4** | release-0.4 | 2022-04-06 | -| **v1alpha3** | release-0.3 | 2022-02-23 | +| API Version | Branch | Supported Until | +| ------------- |-------------|-----------------| +| **v1beta1** | release-1.1 | current stable | +| **v1beta1** | release-1.0 | 2022-02-02 | +| **v1alpha4** | release-0.4 | 2022-04-06 | +| **v1alpha3** | release-0.3 | 2022-02-23 | - The API version is determined from the GroupVersion defined in the top-level `api/` package. - The EOL date is determined from the last release available once a new API version is published. diff --git a/docs/book/src/developer/architecture/controllers/cluster-topology.md b/docs/book/src/developer/architecture/controllers/cluster-topology.md index 6f9eb140411a..b1dd4bdfe698 100644 --- a/docs/book/src/developer/architecture/controllers/cluster-topology.md +++ b/docs/book/src/developer/architecture/controllers/cluster-topology.md @@ -16,4 +16,4 @@ The high level workflow of ClusterTopology reconciliation is shown below. ### Additional information -* See ClusterClass [proposal](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/202105256-cluster-class-and-managed-topologies.md#basic-behaviors) +* See ClusterClass [proposal](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210526-cluster-class-and-managed-topologies.md#basic-behaviors) diff --git a/docs/book/src/developer/providers/implementers-guide/configure.md b/docs/book/src/developer/providers/implementers-guide/configure.md index 5b8d03e77510..6cecdc63453e 100644 --- a/docs/book/src/developer/providers/implementers-guide/configure.md +++ b/docs/book/src/developer/providers/implementers-guide/configure.md @@ -46,7 +46,7 @@ patchesStrategicMerge - manager_config.yaml ``` -[kustomizeyaml]: https://github.com/kubernetes-sigs/kustomize/blob/master/docs/glossary.md#kustomization +[kustomizeyaml]: https://kubectl.docs.kubernetes.io/references/kustomize/kustomization [patch]: https://git.k8s.io/community/contributors/devel/sig-api-machinery/strategic-merge-patch.md ## Our configuration diff --git a/docs/book/src/tasks/experimental-features/cluster-class/change-clusterclass.md b/docs/book/src/tasks/experimental-features/cluster-class/change-clusterclass.md index ea1c7b534ffd..fb8eda732fe0 100644 --- a/docs/book/src/tasks/experimental-features/cluster-class/change-clusterclass.md +++ b/docs/book/src/tasks/experimental-features/cluster-class/change-clusterclass.md @@ -114,7 +114,7 @@ potentially dangerous changes on those objects. -For additional info see [compatibility rules](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/202105256-cluster-class-and-managed-topologies.md#clusterclass-compatibility) +For additional info see [compatibility rules](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210526-cluster-class-and-managed-topologies.md#clusterclass-compatibility) defined in the ClusterClass proposal. ## Planning ClusterClass changes diff --git a/docs/book/src/tasks/experimental-features/cluster-class/index.md b/docs/book/src/tasks/experimental-features/cluster-class/index.md index 063b5d923179..60851406abd6 100644 --- a/docs/book/src/tasks/experimental-features/cluster-class/index.md +++ b/docs/book/src/tasks/experimental-features/cluster-class/index.md @@ -8,7 +8,7 @@ ClusterClass is a powerful abstraction implemented on top of existing interfaces **Variable name to enable/disable the feature gate**: `CLUSTER_TOPOLOGY` Additional documentation: -* Background information: [ClusterClass and Managed Topologies CAEP](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/202105256-cluster-class-and-managed-topologies.md) +* Background information: [ClusterClass and Managed Topologies CAEP](https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20210526-cluster-class-and-managed-topologies.md) * For ClusterClass authors: * [Writing a ClusterClass](./write-clusterclass.md) * [Changing a ClusterClass](./change-clusterclass.md)