From 8dd4053e6a391e9861b895d4e4ef7481056493b7 Mon Sep 17 00:00:00 2001
From: James Harmison <jharmison@gmail.com>
Date: Fri, 5 Jul 2024 12:41:11 -0400
Subject: [PATCH] fix: ensure that `--must-change-password` is present before
 adding

---
 templates/gitea/init.yaml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/templates/gitea/init.yaml b/templates/gitea/init.yaml
index 014e7de..0352836 100644
--- a/templates/gitea/init.yaml
+++ b/templates/gitea/init.yaml
@@ -122,7 +122,16 @@ stringData:
       else
         if [[ "${GITEA_ADMIN_PASSWORD_MODE}" = keepUpdated ]]; then
           echo "Admin account '${GITEA_ADMIN_USERNAME}' already exist. Running update to sync password..."
-          gitea admin user change-password --username "${GITEA_ADMIN_USERNAME}" --password "${GITEA_ADMIN_PASSWORD}" --must-change-password=false
+          # See https://gitea.com/gitea/helm-chart/issues/673
+          # --must-change-password argument was added to change-password, defaulting to true, counter to the previous behavior
+          #   which acted as if it were provided with =false. If the argument is present in this version of gitea, then we
+          #   should add it to prevent requiring frequent admin password resets.
+          local -a change_args
+          change_args=(--username "${GITEA_ADMIN_USERNAME}" --password "${GITEA_ADMIN_PASSWORD}")
+          if gitea admin user change-password --help | grep -qF -- '--must-change-password'; then
+            change_args+=(--must-change-password=false)
+          fi
+          gitea admin user change-password "${change_args[@]}"
           echo '...password sync done.'
         else
           echo "Admin account '${GITEA_ADMIN_USERNAME}' already exist, but update mode is set to '${GITEA_ADMIN_PASSWORD_MODE}'. Skipping."