From 6d4e258de23961eda0c0d41291130baf12f21cec Mon Sep 17 00:00:00 2001
From: Hsiao-nan Cheung <niheaven@gmail.com>
Date: Sun, 23 Jan 2022 11:46:05 +0800
Subject: [PATCH] flux: Rename 'flux2' to 'flux' and move 'fluxctl' to
 'Versions' (#3238)

---
 bucket/{flux2.json => flux.json} | 14 +++++++++++---
 bucket/fluxctl.json              | 20 --------------------
 2 files changed, 11 insertions(+), 23 deletions(-)
 rename bucket/{flux2.json => flux.json} (55%)
 delete mode 100644 bucket/fluxctl.json

diff --git a/bucket/flux2.json b/bucket/flux.json
similarity index 55%
rename from bucket/flux2.json
rename to bucket/flux.json
index d9a2306226..e7beb5f2cf 100644
--- a/bucket/flux2.json
+++ b/bucket/flux.json
@@ -1,12 +1,16 @@
 {
     "version": "0.25.3",
-    "description": "A tool for keeping Kubernetes clusters in sync with sources of configuration",
-    "homepage": "https://toolkit.fluxcd.io",
+    "description": "Open and extensible continuous delivery solution for Kubernetes.",
+    "homepage": "https://fluxcd.io",
     "license": "Apache-2.0",
     "architecture": {
         "64bit": {
             "url": "https://github.com/fluxcd/flux2/releases/download/v0.25.3/flux_0.25.3_windows_amd64.zip",
             "hash": "c419d445e4a970534c3442ee9404b0cb59d3677d1c64e51c574a3cf813840da0"
+        },
+        "32bit": {
+            "url": "https://github.com/fluxcd/flux2/releases/download/v0.25.3/flux_0.25.3_windows_386.zip",
+            "hash": "1dee4da037005517698427fe6866db94033c96d0893942a24da8a51616387268"
         }
     },
     "bin": "flux.exe",
@@ -17,10 +21,14 @@
         "architecture": {
             "64bit": {
                 "url": "https://github.com/fluxcd/flux2/releases/download/v$version/flux_$version_windows_amd64.zip"
+            },
+            "32bit": {
+                "url": "https://github.com/fluxcd/flux2/releases/download/v$version/flux_$version_windows_386.zip"
             }
         },
         "hash": {
             "url": "$baseurl/flux_$version_checksums.txt"
         }
-    }
+    },
+    "notes": "For Flux v1, please install 'versions/fluxctl' instead."
 }
diff --git a/bucket/fluxctl.json b/bucket/fluxctl.json
deleted file mode 100644
index f4609d68d6..0000000000
--- a/bucket/fluxctl.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "version": "1.24.0",
-    "description": "Manage Flux from the Command Line.",
-    "homepage": "https://github.com/fluxcd/flux",
-    "license": "Apache-2.0",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/fluxcd/flux/releases/download/1.24.0/fluxctl_windows_amd64#/fluxctl.exe",
-            "hash": "c375737827a5e6b9763c8a7c4dbc1f8c907306cbe2cbca543c2ed52a5e40e689"
-        }
-    },
-    "bin": "fluxctl.exe",
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/fluxcd/flux/releases/download/$version/fluxctl_windows_amd64#/fluxctl.exe"
-            }
-        }
-    }
-}