Pass the proper object containing devMode to the function populating …

…a new password. cnoe-io#441 Signed-off-by: cmoulliard <[email protected]>
ch007m · Nov 8, 2024 · 6d85851 · 6d85851
1 parent a9c683f
commit 6d85851
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pkg/build/build.go b/pkg/build/build.go
@@ -279,5 +279,6 @@ func isBuildCustomizationSpecEqual(s1, s2 v1alpha1.BuildCustomizationSpec) bool
 		s1.IngressHost == s2.IngressHost &&
 		s1.Port == s2.Port &&
 		s1.UsePathRouting == s2.UsePathRouting &&
-		s1.SelfSignedCert == s2.SelfSignedCert
+		s1.SelfSignedCert == s2.SelfSignedCert &&
+		s1.DevMode == s2.DevMode
 }
diff --git a/pkg/controllers/localbuild/gitea.go b/pkg/controllers/localbuild/gitea.go
@@ -58,7 +58,7 @@ func giteaAdminSecretObject() corev1.Secret {
 }
 
 func newGiteaAdminSecret(devMode bool) (corev1.Secret, error) {
-	// Reuse the same password when dev mode is enabled
+	// Use a default password when dev mode is enabled to avoid to recreate a new one each time
 	pass := giteaDevModePassword
 	if !devMode {
 		var err error
@@ -100,7 +100,7 @@ func (r *LocalbuildReconciler) ReconcileGitea(ctx context.Context, req ctrl.Requ
 
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
-			giteaCreds, err := newGiteaAdminSecret(resource.Spec.BuildCustomization.DevMode)
+			giteaCreds, err := newGiteaAdminSecret(r.Config.DevMode)
 			if err != nil {
 				return ctrl.Result{}, fmt.Errorf("generating gitea admin secret: %w", err)
 			}