wip: moved wait and added 422 check in CreateReadOnlyUser()

packages/gitea/zarf.yaml

@@ -71,6 +71,12 @@ components:
               - name: GIT_SERVER_CREATE_PVC
             mute: true
         after:
+          - wait:
+              cluster:
+                kind: pod
+                namespace: zarf
+                name: app=gitea
+                condition: Ready
           - cmd: ./zarf internal create-read-only-gitea-user --no-progress
             maxRetries: 3
             maxTotalSeconds: 60
@@ -79,11 +85,6 @@ components:
             maxRetries: 3
             maxTotalSeconds: 60
             description: Create an artifact registry token
-          - wait:
-              cluster:
-                kind: pod
-                namespace: zarf
-                name: app=gitea
-                condition: Ready
+
         onFailure:
           - cmd: ./zarf internal update-gitea-pvc --rollback --no-progress

src/internal/packager/git/gitea.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"strings"
 	"time"
 
 	netHttp "net/http"
@@ -75,7 +76,11 @@ func (g *Git) CreateReadOnlyUser() error {
 	})
 	message.Debugf("POST %s:\n%s", createUserEndpoint, string(out))
 	if err != nil {
-		return err
+		if strings.Contains(err.Error(), "422") {
+			message.Debugf("Read-only git user already exists.  Skipping...")
+		} else {
+			return err
+		}
 	}
 
 	// Make sure the user can't create their own repos or orgs