Skip to content

Commit

Permalink
cleanup: fix some more links, including old toolkit.f.i
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Holbach <[email protected]>
  • Loading branch information
Daniel Holbach committed Mar 28, 2022
1 parent 8dacbd2 commit d83ef43
Show file tree
Hide file tree
Showing 19 changed files with 45 additions and 49 deletions.
10 changes: 5 additions & 5 deletions content/en/blog/2021-01-06-january-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ 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](https://fluxcd.io/blog/2020/12/december-update/).
[here](/blog/2020/12/december-update/).

Let's recap what happened in December - there have been many changes.

Expand Down Expand Up @@ -112,7 +112,7 @@ Azure DevOps users will have to specify to use libgit2 in their
GitRepository resources.

Follow [the generic git server
guide](https://fluxcd.io/docs/installation/#generic-git-server)
guide](/docs/installation/#generic-git-server)
for further instructions in how to use Flux with Azure DevOps.

Upcoming events
Expand All @@ -130,16 +130,16 @@ 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 in the Flux world: [https://toolkit.fluxcd.io/core-concepts/](https://toolkit.fluxcd.io/core-concepts/) - 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
good ways to do that:

- Join our [upcoming dev meeting](https://fluxcd.io/community/#meetings) on Jan 14
- Join our [upcoming dev meeting](/community/#meetings) on Jan 14
- 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](https://toolkit.fluxcd.io/get-started/) and give us feedback
- And if you are completely new to Flux v2, take a look at our [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/)

We are looking forward to working with you.
8 changes: 4 additions & 4 deletions content/en/blog/2021-02-01-february-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ aware of what's coming next.
## fluxcd.io website updates

In the last months' summaries we talked about our plans of revamping our
[fluxcd.io website](https://fluxcd.io/). Originally it was mostly just
[fluxcd.io website](/). Originally it was mostly just
spiffy placeholder page which pointed to more Flux resources. Since then
we landed a new design, made its focus Flux2, now we have added two pages
which should hopefully help new users and aspiring contributors learn
about their options getting help and joining the team

- [Community \| Flux](https://fluxcd.io/community/) and
- [SUPPORT \| Flux](https://fluxcd.io/support/)
- [Community \| Flux](/community/) and
- [SUPPORT \| Flux](/support/)

Please let us know if there's anything missing or you'd like to help
with the site or docs.
Expand Down Expand Up @@ -210,7 +210,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](https://toolkit.fluxcd.io/get-started/) and give us feedback
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/).

Expand Down
7 changes: 3 additions & 4 deletions content/en/blog/2021-03-01-march-update/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ 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: [February 2021 Update](https://fluxcd.io/blog/2021/02/february-2021-update/).
here: [February 2021 Update](/blog/2021/02/february-2021-update/).

Let's recap what happened in February - there have been many changes.

Expand Down Expand Up @@ -165,13 +165,12 @@ Find all the information about meetings here:
If you like what you read and would like to get involved, here are a few
good ways to do that:

- Join our [upcoming dev meetings](https://fluxcd.io/community/#meetings)
- Join our [upcoming dev meetings](/community/#meetings)
on March, 3rd 12:00 UTC, or March 11th, 15:00 UTC
- 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](https://toolkit.fluxcd.io/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/).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ users migrate to Flux v2.
Now is the perfect time to familiarise yourself with [Flux
v2](https://fluxcd.io) - the Get Started guide only takes a
couple of minutes to complete. If you prefer a video, check out
[our resources section](https://fluxcd.io/#resources).
[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
Expand Down Expand Up @@ -107,6 +107,5 @@ Check out the following upcoming events
> 19 Apr 2021 - [Setting up Notifications, Alerts, & Webhook with Flux
> v2 by Alison Dowdney](https://www.meetup.com/GitOps-Community/events/276582835/)
Or dive straight into
our [Get Started guide](https://toolkit.fluxcd.io/get-started/)
Or dive straight into our [Get Started guide](/docs/get-started/)
to get started with the next generation of Flux today.
10 changes: 3 additions & 7 deletions content/en/blog/2021-03-31-april-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ who use Flux in production.
Here is a bit of a press round-up if you want to read more about the
history, the move itself and what it means:

- Our own announcement:
[https://fluxcd.io/blog/2021/03/flux-is-a-cncf-incubation-project/](https://fluxcd.io/blog/2021/03/flux-is-a-cncf-incubation-project/)
- [Our own announcement](/blog/2021/03/flux-is-a-cncf-incubation-project)
- CNCF:
[https://www.cncf.io/blog/2021/03/11/cncf-toc-votes-to-move-flux-from-sandbox-to-incubation/](https://www.cncf.io/blog/2021/03/11/cncf-toc-votes-to-move-flux-from-sandbox-to-incubation/)
- CNCF On-Demand Webinar: Flux is Incubating + The Road Ahead:
Expand Down Expand Up @@ -220,8 +219,7 @@ cohesive and inviting, please talk to \@dholbach or \@alisondy on Slack.
If you like what you read and would like to get involved, here are a few
good ways to do that:

- Join our [upcoming dev
meetings](https://fluxcd.io/community/#meetings) on
- Join our [upcoming dev meetings](/community/#meetings) on
2012-04-08 15:00 UTC, or 2021-04-14, 12:00 UTC

- Talk to us in the \#flux channel on [CNCF
Expand All @@ -231,9 +229,7 @@ good ways to do that:
discussions](https://github.com/fluxcd/flux2/discussions)

- And if you are completely new to Flux v2, take a look at our [Get
Started
guide](https://toolkit.fluxcd.io/get-started/) and
give us feedback
Started guide](/docs/get-started/) and give us feedback

- Social media: Follow [Flux on
Twitter](https://twitter.com/fluxcd), join the
Expand Down
6 changes: 3 additions & 3 deletions content/en/blog/2021-04-29-may-update/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: <https://fluxcd.io/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!

Expand Down Expand Up @@ -232,7 +232,7 @@ We feel very fortunate to have Alison on board!
If you like what you read and would like to get involved, here are a few
good ways to do that:

- Join our [upcoming dev meetings](https://fluxcd.io/community/#meetings) on
- Join our [upcoming dev meetings](/community/#meetings) on
2021-05-12 12:00 UTC, or 2021-05-20 15:00 UTC
- Talk to us in the \#flux channel on [CNCF Slack](https://slack.cncf.io/)
- Join the [planning discussions](https://github.com/fluxcd/flux2/discussions)
Expand Down
6 changes: 3 additions & 3 deletions content/en/blog/2021-05-31-june-update/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,14 @@ and [links to recordings](/resources) of past talks.
### Reviewing Flux Governance

More than half a year ago we established our [Flux Governance
document](https://fluxcd.io/governance/). The idea behind
document](/governance/). The idea behind
it was to formalise our values around community, the roles and
responsibilities and processes; many of which had been transparent and
with our full integrity, but still quite ad-hoc up until that point.

For us it's time to review this together with our
[Community](https://fluxcd.io/community/) and
[Contributors docs](https://fluxcd.io/docs/contributing/).
[Community](/community/) and
[Contributors docs](/docs/contributing/).
So we are turning to you for feedback: [please let us know what you
think](https://github.com/fluxcd/flux2/discussions/1457).
What was your experience up until now? Do you feel things are clear
Expand Down
13 changes: 6 additions & 7 deletions content/en/blog/2021-07-02-july-update/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ As the Flux family of projects and its communities are growing, 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](https://fluxcd.io/blog/2021/05/june-2021-update/).
here](/blog/2021/05/june-2021-update/).

Let's recap what happened in June - there has been so much happening!

Expand Down Expand Up @@ -188,7 +188,7 @@ and chat with our engineers.
### The Bug Scrub
Kingdon Barrett organised our first ever [Bug
Scrub](https://fluxcd.io/blog/2021/06/flux-bug-scrub-announce/).
Scrub](/blog/2021/06/flux-bug-scrub-announce/).
To quote from the announcement:
> For us, a great way to get started, is to learn more about Flux
Expand Down Expand Up @@ -254,7 +254,7 @@ of development, providing a unique developer experience with Flux.
Our web and docs team has been busy as well.
🤹 First of all we would like to congratulate everyone who added
themselves to the [Flux Adopters page](https://fluxcd.io/adopters/). It's
themselves to the [Flux Adopters page](/adopters/). It's
beautiful for all of us who work on the Flux to see how our projects are
used in the wild.
Expand All @@ -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](https://fluxcd.io/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!
Expand All @@ -287,14 +286,14 @@ If you like what you read and would like to get involved, here are a few
good ways to do that:
- Join our [upcoming dev
meetings](https://fluxcd.io/community/#meetings) on
meetings](/community/#meetings) on
2021-07-01 15:00 UTC, or 2021-07-07, 12:00 UTC.
- 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](https://fluxcd.io/docs/get-started/)
Started guide](/docs/get-started/)
and give us feedback
- Social media: Follow [Flux on
Twitter](https://twitter.com/fluxcd), join the
Expand Down
2 changes: 1 addition & 1 deletion content/en/blog/2021-08-30-september-update/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ commitment is minimal!

Find our calendar on the Flux website where, thanks to some updates,
finding the [date and time of the next Bug Scrub
meeting](https://fluxcd.io/#calendar) is now more
meeting](/#calendar) is now more
accessible than ever before.

The Zoom link is broadcast via Slack a few minutes before the
Expand Down
2 changes: 1 addition & 1 deletion content/en/blog/2021-10-01-october-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,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
Expand Down
2 changes: 1 addition & 1 deletion content/en/blog/2022-01-31-january-update/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -469,4 +469,4 @@ to help you migrate to Flux v2:

### Where can I find information on how long versions are supported and how often to expect releases?

Releases are as needed for now and a release page with the schedule will be created when Flux reaches general availability status ([Flux roadmap can be found here](https://fluxcd.io/roadmap/)). We understand the importance of having a release schedule and are aware that such a schedule will support the users' ability to plan for an upgrade in advance. For now you can expect the current release cadence of at least once per month to continue.
Releases are as needed for now and a release page with the schedule will be created when Flux reaches general availability status ([Flux roadmap can be found here](/roadmap/)). We understand the importance of having a release schedule and are aware that such a schedule will support the users' ability to plan for an upgrade in advance. For now you can expect the current release cadence of at least once per month to continue.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ accounting for the fact that it's a system with a substantially different
design.
This may at times mean that you have to make adjustments to the way your
current cluster configuration is structured. If you are in this situation
and need help, please refer to the [support page](https://fluxcd.io/support/).
and need help, please refer to the [support page](/support/).
{{% /alert %}}

## Prerequisites
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ spec:
# The Git reference to checkout and monitor for changes
# (defaults to master)
# For all available options, see:
# https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta2.GitRepositoryRef
# https://fluxcd.io/docs/components/source/api/#source.toolkit.fluxcd.io/v1beta2.GitRepositoryRef
ref:
branch: master
```
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/installation/migration/timetable.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)<br><ul><li>Flux 1 releases only include critical bug fixes (which don’t require changing Flux 1 architecture), and security patches (for OS packages, Go runtime, and kubectl). No new features</li><li>Existing projects encouraged to test migration to Flux 2 pre-releases in non-production</li></ul> | Development Mode<br><ul><li>Working to finish parity with Flux 1</li><li>New projects encouraged to test Flux 2 pre-releases in non-production</li></ul> | All Alpha[^2] |
Feb 18, 2021 | Partial Migration Mode<br><ul><li>Existing projects encouraged to migrate to `v1beta1`/`v2beta1` if you only use those features (Flux 1 read-only mode, and Helm Operator)</li><li>Existing projects encouraged to test image automation Alpha in non-production</li></ul> | Feature Parity | Image Automation Alpha. All others reached Feature Parity, Beta |
| June 30, 2021 | Superseded<br><ul><li>All existing projects encouraged to [migrate to Flux 2](/docs/migration/flux-v1-migration/), and [report any bugs](https://github.com/fluxcd/flux2/issues/new/choose)</li><li>Flux 1 Helm Operator code freeze – no further updates except CVEs</li></ul> | Needs further testing, may get breaking changes<br><ul><li>CLI needs further user testing during this migration period</li></ul> | All Beta, Production Ready[^3]<br><ul><li>All Flux 1 features stable and supported in Flux 2</li><li>Promoting Alpha versions to Beta makes this Production Ready</li></ul> |
| June 30, 2021 | Superseded<br><ul><li>All existing projects encouraged to [migrate to Flux 2](/docs/installation/migration/flux-v1-migration/), and [report any bugs](https://github.com/fluxcd/flux2/issues/new/choose)</li><li>Flux 1 Helm Operator code freeze – no further updates except CVEs</li></ul> | Needs further testing, may get breaking changes<br><ul><li>CLI needs further user testing during this migration period</li></ul> | All Beta, Production Ready[^3]<br><ul><li>All Flux 1 features stable and supported in Flux 2</li><li>Promoting Alpha versions to Beta makes this Production Ready</li></ul> |
| TBD | Migration and security support only<br><ul><li>Flux 1 releases only include security patches (no bug fixes)</li><li>Maintainers support users with migration to Flux 2 only, no longer with Flux 1 issues</li><li>Flux 1 archive date announced</li></ul> | Public release (GA), Production Ready<br><ul><li>CLI commits to backwards compatibility moving forward</li><li>CLI follows kubectl style backwards compatibility support: +1 -1 MINOR version for server components (e.g., APIs, Controllers, validation webhooks)</li></ul> | All Beta, Production Ready |
| TBD | Archived<br><ul><li>Flux 1 obsolete, no further releases or maintainer support</li><li>Flux 1 repo archived</li></ul> | Continued active development | Continued active development |

Expand Down
6 changes: 3 additions & 3 deletions content/en/docs/installation/platforms/aws-codecommit.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/operations/monitoring.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ If you wish to use your own Prometheus and Grafana instances, then you can impor
![Annotations Dashboard](/img/grafana-annotation.png)
If you wish to overlap [flux notifications](https://fluxcd.io/docs/components/notification/provider/#grafana) on dashboards you can do it by enabling the grafana annotations alert provider, the desired alerts and the annotation on the dashboard like shown below:
If you wish to overlap [flux notifications](/docs/components/notification/provider/#grafana) on dashboards you can do it by enabling the grafana annotations alert provider, the desired alerts and the annotation on the dashboard like shown below:
![Annotations configuration](/img/grafana-annotations-config.png)
Expand Down
Loading

0 comments on commit d83ef43

Please sign in to comment.