diff --git a/content/en/blog/2021-01-06-january-update.md b/content/en/blog/2021-01-06-january-update.md index b2f89cfff..85d83f4b2 100644 --- a/content/en/blog/2021-01-06-january-update.md +++ b/content/en/blog/2021-01-06-january-update.md @@ -130,7 +130,7 @@ Upcoming events The Flux community is growing and we are in the middle of a quite a few big discussions: -- We have [a new guide which explains core concepts](/docs/concepts/) in the Flux world - please give feedback - and thanks Somtochi! +- We have a [new guide which explains core concepts](/docs/concepts) in the Flux world - please give feedback - and thanks Somtochi! - Flux applies to upgrade to CNCF Incubation status: [https://github.com/cncf/toc/pull/567](https://github.com/cncf/toc/pull/567) If you like what you read and would like to get involved, here are a few diff --git a/content/en/blog/2021-03-01-march-update/index.md b/content/en/blog/2021-03-01-march-update/index.md index 584aa926c..db3675f9b 100644 --- a/content/en/blog/2021-03-01-march-update/index.md +++ b/content/en/blog/2021-03-01-march-update/index.md @@ -109,11 +109,7 @@ Capili](https://www.meetup.com/GitOps-Community/events/276539791/) > Flux v2. > > In this session, Leigh Capili, DX Engineer at Weaveworks, will demo -<<<<<<< HEAD -> the [Flux guide on how to Migrate from Flux v1](/docs/migration/flux-v1-migration/), -======= > the [Flux guide on how to Migrate from Flux v1](/docs/installation/migration/flux-v1-migration), ->>>>>>> Remove guides section > including boostrapping a cluster with Flux 1 and how to move it over > to Flux v2. > @@ -123,15 +119,9 @@ Capili](https://www.meetup.com/GitOps-Community/events/276539791/) > > Resources: > -<<<<<<< HEAD -> πŸ“ [Flux v2 Documentation](/docs/) -> -> πŸ“ [Flux v2 Guide Migrate from Flux v1](/docs/migration/flux-v1-migration/) -======= > πŸ“ [Flux v2 Documentation](/docs) > > πŸ“ [Flux v2 Guide Migrate from Flux v1](/docs/installation/migration/flux-v1-migration) ->>>>>>> Remove guides section > > πŸ“ [Flux v2 roadmap](/roadmap/). @@ -179,8 +169,7 @@ good ways to do that: - Talk to us in the `#flux` channel on [CNCF Slack](https://slack.cncf.io/) - Join the [planning discussions](https://github.com/fluxcd/flux2/discussions) - And if you are completely new to Flux v2, take a look at our - [Get Started guide](/docs/get-started/) and - give us feedback + [Get Started guide](/docs/get-started/) and give us feedback - Social media: Follow [Flux on Twitter](https://twitter.com/fluxcd), join the discussion in the [Flux LinkedIn group](https://www.linkedin.com/groups/8985374/). diff --git a/content/en/blog/2021-03-08-flux-is-a-cncf-incubation-project/index.md b/content/en/blog/2021-03-08-flux-is-a-cncf-incubation-project/index.md index c81e53178..5de5b6afd 100644 --- a/content/en/blog/2021-03-08-flux-is-a-cncf-incubation-project/index.md +++ b/content/en/blog/2021-03-08-flux-is-a-cncf-incubation-project/index.md @@ -68,8 +68,9 @@ toward a GA release, at which point we'll recommend that all Flux v1 users migrate to Flux v2. Now is the perfect time to familiarise yourself with [Flux -v2](/) - the Get Started guide only takes a couple of minutes to complete. -If you prefer a video, check out [our resources section](/#resources). +v2](/) - the Get Started guide only takes a +couple of minutes to complete. If you prefer a video, check out +[our resources section](/resources). Migrating from v1 will require some work, but it will definitely be worth it: in this iteration you are going to get diff --git a/content/en/blog/2021-03-31-april-update.md b/content/en/blog/2021-03-31-april-update.md index 2391d45b5..9c0701f92 100644 --- a/content/en/blog/2021-03-31-april-update.md +++ b/content/en/blog/2021-03-31-april-update.md @@ -67,11 +67,7 @@ Hot on the heels of this was `0.11.0` and v0.1.1 of the Terraform module. - SOPS in the `kustomize-controller` has been updated to v3.7.0, support for the newly added age encryption format is planned. :hourglass_flowing_sand: - All controllers do now record the suspend status of resources in a gotk_suspend_status Prometheus gauge metric. -<<<<<<< HEAD -πŸš€ Check out [the guide on how to automate image updates to Git](/docs/guides/image-update/). -======= πŸš€ Check out [the guide on how to automate image updates](/docs/workflows/image-update/) to Git. ->>>>>>> create workflows section Next up we will triage `image-*` issues and mark upcoming changes for v1alpha2. The proposal for v1alpha2 is under discussion at [https://github.com/fluxcd/flux2/discussions/1124](https://github.com/fluxcd/flux2/discussions/1124). diff --git a/content/en/blog/2021-04-29-may-update/index.md b/content/en/blog/2021-04-29-may-update/index.md index 903410b9b..b72ee57a0 100644 --- a/content/en/blog/2021-04-29-may-update/index.md +++ b/content/en/blog/2021-04-29-may-update/index.md @@ -22,8 +22,8 @@ written by folks at Weaveworks. The Flux community has set itself very ambitious goals for version 2 and as it's a multi-month project, we strive to inform you each month about what has already landed, new possibilities which are available for -integration and where you can get involved. Read last month's update -[here](/blog/2021/03/april-2021-update/). +integration and where you can get involved. Read [last month's update +here](/blog/2021/03/april-2021-update). Let's recap what happened in April - there has been so much happening! diff --git a/content/en/blog/2021-07-02-july-update/index.md b/content/en/blog/2021-07-02-july-update/index.md index ce491b83e..1c47df135 100644 --- a/content/en/blog/2021-07-02-july-update/index.md +++ b/content/en/blog/2021-07-02-july-update/index.md @@ -265,8 +265,7 @@ pieces of infrastructure and came from different repositories. They were hard to update and some of our users got confused about which docs they were looking at. If you have any feedback about this, let us know. -πŸ”‹ We also just added a [Flux Integrations -page](/integrations/). If your extension +πŸ”‹ We also just added a [Flux Ecosystem page](/ecosystem/). If your extension or integration is not listed yet, please add yourself. We will make this page shine more in the future - we are also happy to work on joint blog posts, etc. Just come and talk to us! diff --git a/content/en/blog/2021-08-02-august-update/index.md b/content/en/blog/2021-08-02-august-update/index.md index 692ea3a7f..d3dba47e2 100644 --- a/content/en/blog/2021-08-02-august-update/index.md +++ b/content/en/blog/2021-08-02-august-update/index.md @@ -130,11 +130,7 @@ to Scott Rigby on Slack. In last month's update we discussed how Flux's APIs are now stable. To clarify what this means for the Flux project as a whole, we added the following section to [our migration -<<<<<<< HEAD -timetable](/docs/migration/timetable/): -======= timetable](/docs/installation/migration/timetable/): ->>>>>>> Move migration under installation - Flux 1: Superseded - All existing projects encouraged to migrate to Flux 2, and diff --git a/content/en/blog/2021-10-01-october-update.md b/content/en/blog/2021-10-01-october-update.md index 9148df79b..639c81a9f 100644 --- a/content/en/blog/2021-10-01-october-update.md +++ b/content/en/blog/2021-10-01-october-update.md @@ -265,7 +265,7 @@ growing. Many small improvements to make the content more readable and correct. Go team! Apart from that we were able to add more [adopters](/adopters) and -[integrations](/integrations). Please add yourself if you haven't already. +[integrations](/ecosystem). Please add yourself if you haven't already. What to watch out next for: Alison Dowdney is working on restructuring the documentation to make it even easier to find things. Reach out to her, if you diff --git a/content/en/blog/2022-01-31-january-update/index.md b/content/en/blog/2022-01-31-january-update/index.md index fce224a60..4c16f529a 100644 --- a/content/en/blog/2022-01-31-january-update/index.md +++ b/content/en/blog/2022-01-31-january-update/index.md @@ -355,7 +355,7 @@ internal Kubernetes platform with minimal staff needed to do hands-on administration." Deutsche Telekom uses Flux in its [Das Schiff](https://github.com/telekom/das-schiff) project, you can also find this listed as an -[Integration](/integrations/) on our +[Integration](/ecosystem/) on our website. [Flux Multi-Cluster Multi-Tenant by Example diff --git a/content/en/docs/installation/migration/timetable.md b/content/en/docs/installation/migration/timetable.md index daa7479e5..42939c0d3 100644 --- a/content/en/docs/installation/migration/timetable.md +++ b/content/en/docs/installation/migration/timetable.md @@ -16,7 +16,7 @@ Please refer to the [Roadmap]({{< relref "/roadmap.md" >}}) for additional detai | -- | -- | -- | -- | | Oct 6, 2020 | [Maintenance Mode](https://github.com/fluxcd/website/pull/25)
| Development Mode
| All Alpha[^2] | Feb 18, 2021 | Partial Migration Mode
| Feature Parity | Image Automation Alpha. All others reached Feature Parity, Beta | -| June 30, 2021 | Superseded
| Needs further testing, may get breaking changes
| All Beta, Production Ready[^3]
| +| June 30, 2021 | Superseded
| Needs further testing, may get breaking changes
| All Beta, Production Ready[^3]
| | TBD | Migration and security support only
| Public release (GA), Production Ready
| All Beta, Production Ready | | TBD | Archived
| Continued active development | Continued active development | diff --git a/content/en/docs/installation/platforms/aws-codecommit.md b/content/en/docs/installation/platforms/aws-codecommit.md index 08c40fa4a..2224eb138 100644 --- a/content/en/docs/installation/platforms/aws-codecommit.md +++ b/content/en/docs/installation/platforms/aws-codecommit.md @@ -25,9 +25,9 @@ For more details on how to create an EKS cluster with `eksctl` please see [eksct ## Flux Installation for AWS CodeCommit -The following replicates the [Flux bootstrap procedure](../installation/_index.md#bootstrap) and represents +The following replicates the [Flux bootstrap procedure](/docs/installation/_index.md#bootstrap) and represents the best practice for structuring the repository. For more information on the structure of the repository -please see [Ways of structuring your repositories](../installation/repository-structure.md). +please see [Ways of structuring your repositories](/docs/installation/repository-structure.md). Ensure you can login to [console.aws.amazon.com](https://console.aws.amazon.com) for your proper organization, and create a new repository to hold your Flux install and other Kubernetes resources. @@ -45,7 +45,7 @@ Create a directory inside the repository: mkdir -p ./clusters/my-cluster/flux-system ``` -Download the [Flux CLI](../installation/_index.md#install-the-flux-cli) and generate the manifests with: +Download the [Flux CLI](/docs/installation/_index.md#install-the-flux-cli) and generate the manifests with: ```sh flux install \ diff --git a/content/en/roadmap.md b/content/en/roadmap.md index f1dc7cdb0..afb117b35 100644 --- a/content/en/roadmap.md +++ b/content/en/roadmap.md @@ -97,8 +97,8 @@ Goals State | Item ----- | ---- -:heavy_check_mark: | [Offer a migration guide for those that are using Flux in read-only mode to synchronize plain manifests](/docs/migration/flux-v1-migration/) -:heavy_check_mark: | [Offer a migration guide for those that are using Flux in read-only mode to synchronize Kustomize overlays](/docs/migration/flux-v1-migration/) +:heavy_check_mark: | [Offer a migration guide for those that are using Flux in read-only mode to synchronize plain manifests](/docs/installation/migration/flux-v1-migration/) +:heavy_check_mark: | [Offer a migration guide for those that are using Flux in read-only mode to synchronize Kustomize overlays](/docs/installation/migration/flux-v1-migration/) :heavy_check_mark: | [Offer a dedicated component for forwarding events to external messaging platforms](/docs/operations/notifications/) Non-Goals diff --git a/static/_redirects b/static/_redirects index c88497013..a33b8114a 100644 --- a/static/_redirects +++ b/static/_redirects @@ -24,11 +24,14 @@ /docs/guides/image-update /docs/workflows/image-update 301! /docs/guides/cron-job-image-auth /docs/workflows/cron-job-image-auth 301! /docs/guides/sortable-image-tags /docs/workflows/sortable-image-tags 301! +/docs/guides /docs 301! /docs/use-cases/jenkins /docs/workflows/jenkins 301! /docs/use-cases/gh-actions-auto-pr /docs/workflows/gh-actions-auto-pr 301! /docs/use-cases/gh-actions-manifest-generation /docs/workflows/gh-actions-manifest-generation 301! /docs/use-cases/helm /docs/installation/helm 301! +/docs/use-cases /docs 301! /docs/flux-e2e /docs/concepts/flux-e2e 301! +/docs/migration /docs/installation/migration 301! /docs/migration/helm-operator-migration /docs/installation/migration/helm-operator-migration 301! /docs/migration/timetable /docs/installation/migration/timetable 301! /docs/migration/faq-migration /docs/installation/migration/faq-migration 301!