Always sync registries to team

Author: bbedward

cmd/api/bootstrap.go

@@ -231,37 +231,7 @@ func (self *Bootstrapper) bootstrapTeam(ctx context.Context) error {
 	}
 	if teamCount > 0 {
 		// Bootstrap registry secrets if needed
-		registries, err := self.repos.Ent().Registry.Query().All(ctx)
-		if err != nil {
-			return fmt.Errorf("failed to query registries: %w", err)
-		}
-		teams, err := self.repos.Ent().Team.Query().All(ctx)
-		if err != nil {
-			return fmt.Errorf("failed to query teams: %w", err)
-		}
-		for _, reg := range registries {
-			for _, team := range teams {
-				if reg.KubernetesSecret != "" {
-					// Check existence
-					secretName := reg.KubernetesSecret
-					_, err := self.kubeClient.GetSecret(ctx, secretName, team.Namespace, self.kubeClient.GetInternalClient())
-					if err != nil {
-						if !errors.IsNotFound(err) {
-							return fmt.Errorf("failed to get secret %s in team namespace %s: %w", secretName, team.Namespace, err)
-						}
-					}
-					if errors.IsNotFound(err) {
-						// Copy
-						_, err = self.kubeClient.CopySecret(ctx, secretName, self.cfg.SystemNamespace, team.Namespace, self.kubeClient.GetInternalClient())
-						if err != nil {
-							log.Warnf("Failed to copy registry secret %s to team namespace %s: %v", secretName, team.Namespace, err)
-						}
-					}
-				}
-			}
-		}
-
-		return nil
+		return self.syncRegistrySecretsToTeams(ctx)
 	}
 
 	// Create a team
@@ -349,6 +319,44 @@ func (self *Bootstrapper) bootstrapTeam(ctx context.Context) error {
 		return err
 	}
 
+	// Sync registry secrets to the newly created team
+	return self.syncRegistrySecretsToTeams(ctx)
+}
+
+// * Registry Team Sync
+func (self *Bootstrapper) syncRegistrySecretsToTeams(ctx context.Context) error {
+	log.Infof("Syncing registry secrets to teams")
+
+	registries, err := self.repos.Ent().Registry.Query().All(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to query registries: %w", err)
+	}
+	teams, err := self.repos.Ent().Team.Query().All(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to query teams: %w", err)
+	}
+	for _, reg := range registries {
+		for _, team := range teams {
+			if reg.KubernetesSecret != "" {
+				// Check existence
+				secretName := reg.KubernetesSecret
+				_, err := self.kubeClient.GetSecret(ctx, secretName, team.Namespace, self.kubeClient.GetInternalClient())
+				if err != nil {
+					if !errors.IsNotFound(err) {
+						return fmt.Errorf("failed to get secret %s in team namespace %s: %w", secretName, team.Namespace, err)
+					}
+				}
+				if errors.IsNotFound(err) {
+					// Copy
+					_, err = self.kubeClient.CopySecret(ctx, secretName, self.cfg.SystemNamespace, team.Namespace, self.kubeClient.GetInternalClient())
+					if err != nil {
+						log.Warnf("Failed to copy registry secret %s to team namespace %s: %v", secretName, team.Namespace, err)
+					}
+				}
+			}
+		}
+	}
+
 	return nil
 }
 

pkg/templates/formbricks.go

@@ -62,7 +62,7 @@ func formbricksTemplate() *schema.TemplateDefinition {
 				InputIDs:  []string{"input_domain", "input_storage_size"},
 				Type:      schema.ServiceTypeDockerimage,
 				Builder:   schema.ServiceBuilderDocker,
-				Image:     utils.ToPtr("ghcr.io/formbricks/formbricks:v3.13.1"),
+				Image:     utils.ToPtr("ghcr.io/formbricks/formbricks:v3.14.0"),
 				DependsOn: []string{"service_postgresql"},
 				Resources: &schema.Resources{
 					CPURequestsMillicores: 30,

pkg/templates/n8n.go

@@ -175,7 +175,7 @@ func n8nTemplate() *schema.TemplateDefinition {
 				Name:      "n8n",
 				Type:      schema.ServiceTypeDockerimage,
 				Builder:   schema.ServiceBuilderDocker,
-				Image:     utils.ToPtr("n8nio/n8n:1.97.0"),
+				Image:     utils.ToPtr("n8nio/n8n:1.97.1"),
 				Resources: &schema.Resources{
 					CPURequestsMillicores: 40,
 					CPULimitsMillicores:   400,