Merge pull request #1218 from dholbach/flux-v1-deprecation

Update wording and docs for v1 archival

adopters/3-flux-v1.yaml

@@ -1,3 +1,10 @@
+# Flux Legacy and Helm Operator have been archived
+# https://fluxcd.io/blog/2022/10/september-2022-update/#flux-legacy-v1-retirement-plan
+#
+# We strongly recommend you familiarise yourself with the newest Flux and
+# migrate as soon as possible: https://fluxcd.io/flux/migration/
+#
+
 adopters:
   project: Flux (legacy)
   description: >

content/en/flux/migration/_index.md

@@ -4,3 +4,14 @@ linkTitle: "Migration"
 description: "Migration guides for Flux v1 and Helm Operator users."
 weight: 60
 ---
+
+{{% alert color="warning" title="Flux Legacy has reached end of life." %}}
+Flux Legacy and Helm Operator have [been
+archived](/blog/2022/10/september-2022-update/#flux-legacy-v1-retirement-plan).
+
+We strongly recommend you familiarise yourself with the newest Flux and [migrate as soon as possible](/flux/migration/).
+{{% /alert %}}
+
+If you still need migration help, there are still [free migration
+workshops](https://bit.ly/FluxMigrationSurvey), or reach out for paid
+support to one of the companies [listed here](/support/#my-employer-needs-additional-help).

content/en/flux/migration/faq-migration.md

@@ -15,12 +15,13 @@ functionalities into specialized controllers, collectively called the GitOps Too
 You can install and operate Flux v2 simply using the `flux` command.
 You can easily pick and choose the functionality you need and extend it to serve your own purposes.
 
-The timeline we are looking at right now is:
+We went through the following steps for our community:
 
 1. Put Flux v1 into maintenance mode (no new features being added; bugfixes and CVEs patched only).
-1. Continue work on the [Flux v2 roadmap](/roadmap/).
-1. We will provide transition guides for specific user groups, e.g. users of Flux v1 in read-only mode, or of Helm Operator v1, etc. once the functionality is integrated into Flux v2 and it's deemed "ready".
-1. Once the use-cases of Flux v1 are covered, we will continue supporting Flux v1 for 6 months. This will be the transition period before it's considered unsupported.
+1. Continued work on the [Flux v2 roadmap](/roadmap/).
+1. We provided transition guides for specific user groups, e.g. users of Flux v1 in read-only mode, or of Helm Operator v1, etc. once the functionality was integrated into Flux v2 and it's deemed "ready".
+1. Once the use-cases of Flux v1 were covered, we promised to continue supporting Flux v1 for 6 months.
+1. We [finally archived](/blog/2022/10/september-2022-update/#flux-legacy-v1-retirement-plan) Flux Legacy and Helm Operator.
 
 ### Why did you rewrite Flux?
 
@@ -50,7 +51,7 @@ Declarative config via arguments in the Flux deployment | `GitRepository` custom
 Follow `HEAD` of Git branches | Supports Git branches, pinning on commits and tags, follow SemVer tag ranges
 Suspending of reconciliation by downscaling Flux deployment | Reconciliation can be paused per resource by suspending the `GitRepository`
 Credentials config via Arguments and/or Secret volume mounts in the Flux pod | Credentials config per `GitRepository` resource: SSH private key, HTTP/S username/password/token, OpenPGP public keys
-Ignoring resources with `fluxcd.io/ignore: "true"` annotation | Ignoring resources with `kustomize.toolkit.fluxcd.io/reconcile: disabled` annotation 
+Ignoring resources with `fluxcd.io/ignore: "true"` annotation | Ignoring resources with `kustomize.toolkit.fluxcd.io/reconcile: disabled` annotation
 
 #### `kustomize` support
 

content/en/flux/migration/flux-v1-migration.md

@@ -11,16 +11,6 @@ card:
 This guide walks you through migrating from Flux v1 to v2.
 Read the [FAQ]({{< relref "/faq-migration" >}}) to find out what differences are between v1 and v2.
 
-{{% alert color="info" title="Feature parity" %}}
-"Feature parity" does not mean Flux v2 works exactly the same as v1 (or is
-backward-compatible); it means you can accomplish the same results, while
-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](/support/).
-{{% /alert %}}
-
 ## Prerequisites
 
 You will need a Kubernetes cluster version **1.20** or newer

content/en/flux/migration/timetable.md

@@ -2,14 +2,15 @@
 title: "Timetable"
 linkTitle: "Migration and Support Timetable"
 description: "Flux v1 to v2 migration and support timetable."
-weight: 5
+weight: 150
 hugeTable: true
 ---
 
-{{% alert color="info" title="💖 Flux Migration Commitment" %}}
-This public timetable clarifies our commitment to end users.
-Its purpose is to help improve your experience in deciding how and when to plan infra decisions related to Flux versions.
-Please refer to the [Roadmap]({{< relref "../../roadmap.md" >}}) for additional details.
+{{% alert color="warning" title="Flux Legacy has reached end of life." %}}
+Flux Legacy and Helm Operator have [been
+archived](/blog/2022/10/september-2022-update/#flux-legacy-v1-retirement-plan).
+
+We strongly recommend you familiarise yourself with the newest Flux and [migrate as soon as possible](/flux/migration/).
 {{% /alert %}}
 
 | Date | Flux 1 | Flux 2 CLI | GOTK[^1] |

layouts/partials/docs/legacy-warning.html

@@ -1,11 +1,11 @@
-<div class="pageinfo pageinfo-warning">
+<div class="pageinfo pageinfo-danger">
     <h2>Upgrade Advisory</h2>
     <p>This documentation is for Flux (v1) and Helm Operator (v1).
-       Both projects are in maintenance mode and will
+       Both projects have reached their
        <a href="/blog/2022/10/september-2022-update/#flux-legacy-v1-retirement-plan">
-         reach end-of-life in November 2022.</a></p>
+         end-of-life in November 2022</a> and have been archived.</p>
     <p>We strongly recommend you familiarise yourself with the newest Flux and
-       <a href="/flux/migration/">start looking at your migration path</a>.</p>
+       <a href="/flux/migration/">migrate as soon as possible</a>.</p>
     <p>For documentation regarding the latest Flux, please refer to
        <a href="/flux/">this section</a>.</p>
 </div>