Skip to content

refactor: port routes_gitops.go self-upgrade to ops.RegisterSelfUpgrade (epic #23725 slice 2b.7) [architect] #23754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hivecommons-hive merged 1 commit into from
Sep 26, 2026
+39 −4
Merged

refactor: port routes_gitops.go self-upgrade to ops.RegisterSelfUpgrade (epic #23725 slice 2b.7) [architect] #23754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions pkg/api/handlers/ops/registrar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package ops

import (
"github.com/gofiber/fiber/v2"

"github.com/kubestellar/console/pkg/api/transport"
k8sclient "github.com/kubestellar/console/pkg/k8s"
"github.com/kubestellar/console/pkg/store"
)

// RegisterSelfUpgrade wires the /self-upgrade/status and
// /self-upgrade/trigger routes onto router, using the shared multi-cluster
// client, transport hub, and persistence store. It preserves the exact
// route order previously registered by hand in setupGitOpsRoutes so
// fiber's first-match semantics are unchanged (epic #23685 phase 2,
// #23725 slice 2b.7).
//
// A file-scoped registrar is used rather than a monolithic ops.Register
// because each ops handler (air-gap, manifest, notifications, onboarding,
// ping, self-upgrade, timeline, token-usage) is wired from a different
// route file in pkg/api. Individual RegisterXxx functions let each caller
// wire only what it needs without importing sibling subdomains.
//
// The signature is domain-local (not handlers.Registrar) because the
// parent pkg/api/handlers package still imports pkg/api/handlers/ops
// through ops_aliases.go, so this subpackage cannot import the parent's
// Deps/Registrar types without an import cycle. Slice 2c collapses all
// domain registrars onto a shared signature once the final _aliases.go
// files are retired.
func RegisterSelfUpgrade(router fiber.Router, k8sClient *k8sclient.MultiClusterClient, hub *transport.Hub, store store.Store) {
h := NewSelfUpgradeHandler(k8sClient, hub, store)
router.Get("/self-upgrade/status", h.GetStatus)
router.Post("/self-upgrade/trigger", h.TriggerUpgrade)
}
9 changes: 5 additions & 4 deletions pkg/api/routes_gitops.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package api
import (
"github.com/gofiber/fiber/v2"

"github.com/kubestellar/console/pkg/api/handlers"
"github.com/kubestellar/console/pkg/api/handlers/gitops"
"github.com/kubestellar/console/pkg/api/handlers/ops"
)

// setupGitOpsRoutes registers GitOps, ArgoCD, and self-upgrade routes.
Expand All @@ -29,9 +29,10 @@ func (s *Server) setupGitOpsRoutes(api fiber.Router) {
// kubeconfig instead of the backend pod ServiceAccount.

// Helm self-upgrade (in-cluster Deployment patch)
selfUpgradeHandler := handlers.NewSelfUpgradeHandler(s.k8sClient, s.hub, s.store)
api.Get("/self-upgrade/status", selfUpgradeHandler.GetStatus)
api.Post("/self-upgrade/trigger", selfUpgradeHandler.TriggerUpgrade)
// Wired through the ops domain registrar (#23725 slice 2b.7). Route
// order is preserved by RegisterSelfUpgrade so fiber's first-match
// semantics are unchanged.
ops.RegisterSelfUpgrade(api, s.k8sClient, s.hub, s.store)

// ArgoCD routes (Application CRD discovery and sync)
api.Get("/gitops/argocd/applications", gitopsHandlers.ListArgoApplications)
Expand Down
Loading