Merge pull request #2241 from fluxcd/backport-2240-to-v2-6

[v2-6] Complete Flux 2.6.0 release

Author: matheuscscp

.github/workflows/netlify.yml

@@ -12,4 +12,4 @@ jobs:
     steps:
       - name: Deploy current production branch on Netlify
         run: |
-          curl -X POST -d {} '${{ secrets.NETLIFY_BUILD_HOOK }}?trigger_branch=v2-5'
+          curl -X POST -d {} '${{ secrets.NETLIFY_BUILD_HOOK }}?trigger_branch=v2-6'

content/en/_index.html

@@ -66,8 +66,8 @@
       all have great dashboards for you.
 ---
 
-{{% home/announce emoji="📢" url="/blog/2025/02/flux-v2.5.0/" %}}
-Announcing Flux 2.5 GA
+{{% home/announce emoji="📢" url="/blog/2025/05/flux-v2.6.0/" %}}
+Announcing Flux 2.6 GA
 {{% /home/announce %}}
 
 <div class="hero-gitops">

content/en/flux/releases/procedure.md

@@ -336,18 +336,23 @@ The following instructions assume you're updating the website for the Flux relea
    git checkout -b v2-N
    git push origin HEAD:v2-N
    ```
-1. Apply the labels `backport:v2-N`, `backport:v2-(N-1)` and `backport:v2-(N-2)` to the PR created above so that the
-   `hugo.yaml` file gets updated in the older versions' websites. This step will lead to 3 PRs being automatically
-   created for each of the supported release branches of the website. Do not merge these PRs, yet!
+1. Apply the labels `backport:v2-(N-1)` and `backport:v2-(N-2)` to the PR created above so that the
+   `hugo.yaml` file gets updated in the older versions' websites. This step will lead to 2 PRs being
+   automatically created for the two last supported release branches of the website. **Do not merge these
+   PRs, yet!**
 1. In the PR for the `v2-(N-1)` branch, edit the `hugo.yaml` file and set `params.archived_version` to `true`.
 1. Go to https://app.netlify.com/sites/fluxcd/configuration/deploys#branches-and-deploy-contexts
 1. Click on "Configure"
 1. In "Production branch", change the value from `v2-(N-1)` to `v2-N`.
 1. In "Additional branches" add the "v2-(N-1)" branch.
 1. Click "Save".
 1. Now merge the 3 PRs created by the labels you applied in the previous step.
-1. Create another PR against the `main` branch to update the `trigger_branch` URL query parameter in the
-   file `.github/workflows/netlify.yml` to point to "v2-N".
+1. Create another PR against the `main` branch to:
+   1. Update the `trigger_branch` URL query parameter in the file `.github/workflows/netlify.yml` to point to "v2-N".
+   1. Update the website announcement banner in the file `content/en/_index.html` to point to the blog post of
+      the new release, and change the string right below from  `Announcing Flux 2.N-1 GA` to
+      `Announcing Flux 2.N GA`.
+1. Merge the PR and backport to the `v2-N` branch by applying the `backport:v2-N` label to the PR.
 
 #### Distribution: patch releases
 

hack/import-flux2-assets.sh

@@ -146,9 +146,18 @@ function gen_ctrl_docs {
     gen_crd_doc "https://raw.githubusercontent.com/fluxcd/${ctrl}/${ctrl_version}/docs/spec/${version}/${name}.md" "$COMPONENTS_DIR/${ctrl_out}/${name}.md"
   done
 
-  # special case: n-c's `Events` type is not a CRD but needs to be documented, too.
+  # special cases for n-c
   if [ "${ctrl}" = "notification-controller" ] ; then
+    # `Events` type is not a CRD but needs to be documented, too.
     gen_crd_doc "https://raw.githubusercontent.com/fluxcd/${ctrl}/${ctrl_version}/docs/spec/v1beta2/events.md" "$COMPONENTS_DIR/${ctrl_out}/events.md"
+
+    # Hack for fixing typo in the docs
+    sed -i \
+      's#((https://docs\.github\.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token))#(https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token)#g' \
+      "$COMPONENTS_DIR/${ctrl_out}/providers.md"
+    sed -i \
+      's#((https://docs\.github\.com/en/apps/creating-github-apps/authenticating-with-a-github-app/authenticating-as-a-github-app-installation))#(https://docs.github.com/en/apps/creating-github-apps/authenticating-with-a-github-app/authenticating-as-a-github-app-installation)#g' \
+      "$COMPONENTS_DIR/${ctrl_out}/providers.md"
   fi
 }