mirror of
https://github.com/hanzoai/cd.git
synced 2026-10-30 14:56:45 +00:00
* feat(api): hard-fork CRD API group argoproj.io -> deploy.hanzo.ai
Hanzo CD hard-fork, phase 1.1. Single source of truth is
pkg/apis/application/register.go's Group constant (Application/AppProject/
ApplicationSet all derive their FullName from it); every other Go call-site
that hardcoded the literal group string is updated to match: the 3 generated
informer GVRs, the app-of-apps nested-Application detector in types.go, the
resource-tree Application-kind cache populator, the 3 NotFound error
constructors in server/application, and the applicationset-controller's
leader-election Lease name/ID (kept in lockstep across Go source + RBAC
resourceNames, or leader election would get RBAC-denied on startup).
CRD YAMLs (application/appproject/applicationset) and every RBAC apiGroups
rule that actually governs our 3 CRDs are repointed to deploy.hanzo.ai, across
both manifests/base/* (namespaced Roles) and manifests/cluster-rbac/* (cluster
scope). Two adjacent things that share the "argoproj.io" string but are NOT
ours are deliberately left untouched: gitops-engine's health-check dispatch
for Argo Workflows' `Workflow` kind, and argocd-server-clusterrole's second
apiGroups block granting read on Argo Workflows' `workflows` resource — both
belong to a separate, unrelated Argoproj-family project we are not forking.
Also untouched, per explicit scope: annotation/label keys (argocd.argoproj.io/*)
and finalizers (*.argoproj.io) that track already-applied live resources, and
argocd-cm.yaml's resource.customizations.ignoreResourceUpdates keys (a narrow
app-of-apps diffing nicety, not build- or RBAC-relevant).
CGO_ENABLED=0 go build ./... verified green.
* ci: wire canonical hanzo.yml + cicd.yml (Hanzo CD image build)
Phase 1.3. Follows the same one-way pattern every hanzo/lux/zoo repo uses:
hanzo.yml declares the image (root Dockerfile -> ghcr.io/hanzoai/deploy) and a
fast go-build sanity test (the multi-stage Dockerfile build is the slow, real
gate); cicd.yml is the ~10-line trigger shim importing hanzoai/ci's reusable
build workflow on the arc pool, secrets from KMS only.
No `deploy:` block yet, matching the hanzoai/cms build-only-first-cutover
pattern: this repo's own live hanzo-cd namespace runs the whole Hanzo fleet's
GitOps, so the prod image/CRD swap is a deliberate separate action (see the
[HELD] universe PR), never an automatic rollout on merge. Every PR/push still
builds and pushes an immutable ghcr.io/hanzoai/deploy:sha-<7>-amd64 image.
* feat(ui): rebrand Argo CD -> Hanzo CD (title, favicon, logo, sidebar)
Phase 1.2. User-facing "Argo CD"/"ArgoCD" text replaced with "Hanzo CD"
across the login page, help modal, settings screens, version-info panel,
sync-options warning, fullscreen-logs title, app.tsx page titles, and
index.html's <title>/noscript text (dropped the now-wrong upstream CLI
doc link rather than invent a hanzo.ai URL that doesn't exist).
Logo/favicon assets replaced with the canonical Hanzo mark (never
hand-drawn, copied from ~/work/hanzo/logo/dist): the two real usages of
Argo's logo collapse onto one Hanzo glyph (mono + white variants) at the
same 5 call sites (login icon + footer, login.scss $logoPath/
$logoNegativePath, sidebar text-logo), preserving the existing CSS
invert() filters so both the light login panel and dark sidebar still
render correctly. Old argologo.svg/argo_o.svg/argo.png deleted (no
longer referenced). favicon-{16x16,32x32}.png added at
ui/src/assets/favicon/ (index.html's links to that path were previously
dead - the directory didn't exist in this checkout). package.json name
argo-cd-ui -> hanzo-cd-ui.
Left alone, deliberately: the two Kubernetes resource-kind icon sets
under ui/src/assets/images/resources/ (unrelated to branding), and
upstream doc/project links (argoproj.io, argo-cd.readthedocs.io) since
we have no equivalent hanzo.ai docs to point to yet - except the login
footer logo's outbound link, which now points to hanzo.ai instead of
argoproj.io (a Hanzo-branded mark linking to the upstream project it
was forked from read as an obvious leftover).
* feat(module): rename Go module github.com/argoproj/argo-cd/v3 -> github.com/hanzoai/deploy
Phase 2. No version suffix on the new path (org policy: never publish our
own Go modules above v1.x.x / with a v2+ suffix) — this fork starts a fresh
v0/v1 module identity rather than carrying the v3 the upstream fork point
had reached.
Mechanical, symmetric rewrite: 704 .go files (import statements only; two
disjoint substitutions applied specific-first so the nested gitops-engine
module path never double-matches), plus go.mod (module line, the
gitops-engine require+replace pair, version reset to v0.0.0-... since a
suffix-less path can't carry a v3 semver), gitops-engine/go.mod, Makefile
(ldflags PACKAGE + 2 TEST_MODULE filters), .golangci.yaml, .goreleaser.yaml,
.mockery.yaml (+ gitops-engine's), Procfile, the codegen/proto generation
scripts (hack/generate-proto.sh, update-codegen.sh, update-openapi.sh), and
20 .proto files' go_package options. Also one OpenTelemetry tracer name
string in gitops-engine/pkg/sync/sync_context.go (a cosmestic label, not an
import, but worth keeping consistent).
CGO_ENABLED=0 go build ./... verified green for both the root module and
the nested gitops-engine module; go vet clean on both; go mod tidy run
(network available) to reconcile go.sum, dependency set unchanged.
Left alone, deliberately: doc-only mentions (docs/snyk/*.html scan reports,
gitops-engine/README.md), a comment-only reference in
.github/workflows/release.yaml, and one Renovate bot config line — none are
build- or codegen-load-bearing. Also left alone: comments citing upstream
GitHub issue URLs (github.com/argoproj/argo-cd/issues/NNNNN) and a handful
of test fixtures using "https://github.com/argoproj/argo-cd.git" as a
representative example repo URL — both are accurate historical/test-data
references, not stale self-references.
---------
Co-authored-by: Hanzo Dev <[email protected]>
284 lines
8.6 KiB
Go
284 lines
8.6 KiB
Go
package sharding
|
|
|
|
import (
|
|
"maps"
|
|
"strconv"
|
|
"sync"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/db"
|
|
)
|
|
|
|
type ClusterShardingCache interface {
|
|
Init(clusters *v1alpha1.ClusterList, apps *v1alpha1.ApplicationList)
|
|
Add(c *v1alpha1.Cluster)
|
|
Delete(clusterServer string)
|
|
Update(oldCluster *v1alpha1.Cluster, newCluster *v1alpha1.Cluster)
|
|
AddApp(a *v1alpha1.Application)
|
|
DeleteApp(a *v1alpha1.Application)
|
|
UpdateApp(a *v1alpha1.Application)
|
|
IsManagedCluster(c *v1alpha1.Cluster) bool
|
|
GetDistribution() map[string]int
|
|
GetAppDistribution() map[string]int
|
|
UpdateShard(shard int) bool
|
|
}
|
|
|
|
type ClusterSharding struct {
|
|
Shard int
|
|
Replicas int
|
|
Shards map[string]int
|
|
Clusters map[string]*v1alpha1.Cluster
|
|
Apps map[string]*v1alpha1.Application
|
|
lock sync.RWMutex
|
|
getClusterShard DistributionFunction
|
|
}
|
|
|
|
func NewClusterSharding(_ db.ArgoDB, shard, replicas int, shardingAlgorithm string) ClusterShardingCache {
|
|
log.Debugf("Processing clusters from shard %d: Using filter function: %s", shard, shardingAlgorithm)
|
|
clusterSharding := &ClusterSharding{
|
|
Shard: shard,
|
|
Replicas: replicas,
|
|
Shards: make(map[string]int),
|
|
Clusters: make(map[string]*v1alpha1.Cluster),
|
|
Apps: make(map[string]*v1alpha1.Application),
|
|
}
|
|
distributionFunction := NoShardingDistributionFunction()
|
|
if replicas > 1 {
|
|
log.Debugf("Processing clusters from shard %d: Using filter function: %s", shard, shardingAlgorithm)
|
|
distributionFunction = GetDistributionFunction(clusterSharding.getClusterAccessor(), clusterSharding.getAppAccessor(), shardingAlgorithm, replicas)
|
|
} else {
|
|
log.Info("Processing all cluster shards")
|
|
}
|
|
clusterSharding.getClusterShard = distributionFunction
|
|
return clusterSharding
|
|
}
|
|
|
|
// IsManagedCluster returns whether or not the cluster should be processed by a given shard.
|
|
func (sharding *ClusterSharding) IsManagedCluster(c *v1alpha1.Cluster) bool {
|
|
sharding.lock.RLock()
|
|
defer sharding.lock.RUnlock()
|
|
if c == nil { // nil cluster (in-cluster) is always managed by current clusterShard
|
|
return true
|
|
}
|
|
if skipReconcile, err := strconv.ParseBool(c.Annotations[common.AnnotationKeyAppSkipReconcile]); err == nil && skipReconcile {
|
|
log.Debugf("Cluster %s has %s annotation set, skipping", c.Server, common.AnnotationKeyAppSkipReconcile)
|
|
return false
|
|
}
|
|
clusterShard := 0
|
|
if shard, ok := sharding.Shards[c.Server]; ok {
|
|
clusterShard = shard
|
|
} else {
|
|
log.Warnf("The cluster %s has no assigned shard.", c.Server)
|
|
}
|
|
log.Debugf("Checking if cluster %s with clusterShard %d should be processed by shard %d", c.Server, clusterShard, sharding.Shard)
|
|
return clusterShard == sharding.Shard
|
|
}
|
|
|
|
func (sharding *ClusterSharding) Init(clusters *v1alpha1.ClusterList, apps *v1alpha1.ApplicationList) {
|
|
sharding.lock.Lock()
|
|
defer sharding.lock.Unlock()
|
|
newClusters := make(map[string]*v1alpha1.Cluster, len(clusters.Items))
|
|
for _, c := range clusters.Items {
|
|
cluster := c
|
|
newClusters[c.Server] = &cluster
|
|
}
|
|
sharding.Clusters = newClusters
|
|
|
|
newApps := make(map[string]*v1alpha1.Application, len(apps.Items))
|
|
for i := range apps.Items {
|
|
app := apps.Items[i]
|
|
newApps[app.Name] = &app
|
|
}
|
|
sharding.Apps = newApps
|
|
sharding.updateDistribution()
|
|
}
|
|
|
|
func (sharding *ClusterSharding) Add(c *v1alpha1.Cluster) {
|
|
sharding.lock.Lock()
|
|
defer sharding.lock.Unlock()
|
|
|
|
old, ok := sharding.Clusters[c.Server]
|
|
sharding.Clusters[c.Server] = c
|
|
if !ok || hasShardingUpdates(old, c) {
|
|
sharding.updateDistribution()
|
|
} else {
|
|
log.Debugf("Skipping sharding distribution update. Cluster already added")
|
|
}
|
|
}
|
|
|
|
func (sharding *ClusterSharding) Delete(clusterServer string) {
|
|
sharding.lock.Lock()
|
|
defer sharding.lock.Unlock()
|
|
if _, ok := sharding.Clusters[clusterServer]; ok {
|
|
delete(sharding.Clusters, clusterServer)
|
|
delete(sharding.Shards, clusterServer)
|
|
sharding.updateDistribution()
|
|
}
|
|
}
|
|
|
|
func (sharding *ClusterSharding) Update(oldCluster *v1alpha1.Cluster, newCluster *v1alpha1.Cluster) {
|
|
sharding.lock.Lock()
|
|
defer sharding.lock.Unlock()
|
|
|
|
if _, ok := sharding.Clusters[oldCluster.Server]; ok && oldCluster.Server != newCluster.Server {
|
|
delete(sharding.Clusters, oldCluster.Server)
|
|
delete(sharding.Shards, oldCluster.Server)
|
|
}
|
|
sharding.Clusters[newCluster.Server] = newCluster
|
|
if hasShardingUpdates(oldCluster, newCluster) {
|
|
sharding.updateDistribution()
|
|
} else {
|
|
log.Debugf("Skipping sharding distribution update. No relevant changes")
|
|
}
|
|
}
|
|
|
|
func (sharding *ClusterSharding) GetDistribution() map[string]int {
|
|
sharding.lock.RLock()
|
|
defer sharding.lock.RUnlock()
|
|
shards := sharding.Shards
|
|
|
|
distribution := make(map[string]int, len(shards))
|
|
maps.Copy(distribution, shards)
|
|
return distribution
|
|
}
|
|
|
|
func (sharding *ClusterSharding) updateDistribution() {
|
|
for k, c := range sharding.Clusters {
|
|
shard := 0
|
|
if c.Shard != nil {
|
|
requestedShard := int(*c.Shard)
|
|
if requestedShard < sharding.Replicas {
|
|
shard = requestedShard
|
|
} else {
|
|
log.Warnf("Specified cluster shard (%d) for cluster: %s is greater than the number of available shard (%d). Using shard 0.", requestedShard, c.Server, sharding.Replicas)
|
|
}
|
|
} else {
|
|
shard = sharding.getClusterShard(c)
|
|
}
|
|
|
|
existingShard, ok := sharding.Shards[k]
|
|
switch {
|
|
case ok && existingShard != shard:
|
|
log.Infof("Cluster %s has changed shard from %d to %d", k, existingShard, shard)
|
|
case !ok:
|
|
log.Infof("Cluster %s has been assigned to shard %d", k, shard)
|
|
default:
|
|
log.Debugf("Cluster %s has not changed shard", k)
|
|
}
|
|
sharding.Shards[k] = shard
|
|
}
|
|
}
|
|
|
|
// hasShardingUpdates returns true if the sharding distribution has explicitly changed
|
|
func hasShardingUpdates(old, newCluster *v1alpha1.Cluster) bool {
|
|
if old == nil || newCluster == nil {
|
|
return false
|
|
}
|
|
|
|
// returns true if the cluster id has changed because some sharding algorithms depend on it.
|
|
if old.ID != newCluster.ID {
|
|
return true
|
|
}
|
|
|
|
if old.Server != newCluster.Server {
|
|
return true
|
|
}
|
|
|
|
// return false if the shard field has not been modified
|
|
if old.Shard == nil && newCluster.Shard == nil {
|
|
return false
|
|
}
|
|
return old.Shard == nil || newCluster.Shard == nil || int64(*old.Shard) != int64(*newCluster.Shard)
|
|
}
|
|
|
|
// A read lock should be acquired before calling getClusterAccessor.
|
|
func (sharding *ClusterSharding) getClusterAccessor() clusterAccessor {
|
|
return func() []*v1alpha1.Cluster {
|
|
// no need to lock, as this is only called from the updateDistribution function
|
|
clusters := make([]*v1alpha1.Cluster, 0, len(sharding.Clusters))
|
|
for _, c := range sharding.Clusters {
|
|
clusters = append(clusters, c)
|
|
}
|
|
return clusters
|
|
}
|
|
}
|
|
|
|
// A read lock should be acquired before calling getAppAccessor.
|
|
func (sharding *ClusterSharding) getAppAccessor() appAccessor {
|
|
return func() []*v1alpha1.Application {
|
|
apps := make([]*v1alpha1.Application, 0, len(sharding.Apps))
|
|
for _, a := range sharding.Apps {
|
|
apps = append(apps, a)
|
|
}
|
|
return apps
|
|
}
|
|
}
|
|
|
|
func (sharding *ClusterSharding) AddApp(a *v1alpha1.Application) {
|
|
sharding.lock.Lock()
|
|
defer sharding.lock.Unlock()
|
|
|
|
_, ok := sharding.Apps[a.Name]
|
|
sharding.Apps[a.Name] = a
|
|
if !ok {
|
|
sharding.updateDistribution()
|
|
} else {
|
|
log.Debugf("Skipping sharding distribution update. App already added")
|
|
}
|
|
}
|
|
|
|
func (sharding *ClusterSharding) DeleteApp(a *v1alpha1.Application) {
|
|
sharding.lock.Lock()
|
|
defer sharding.lock.Unlock()
|
|
if _, ok := sharding.Apps[a.Name]; ok {
|
|
delete(sharding.Apps, a.Name)
|
|
sharding.updateDistribution()
|
|
}
|
|
}
|
|
|
|
func (sharding *ClusterSharding) UpdateApp(a *v1alpha1.Application) {
|
|
sharding.lock.Lock()
|
|
defer sharding.lock.Unlock()
|
|
|
|
_, ok := sharding.Apps[a.Name]
|
|
sharding.Apps[a.Name] = a
|
|
if !ok {
|
|
sharding.updateDistribution()
|
|
} else {
|
|
log.Debugf("Skipping sharding distribution update. No relevant changes")
|
|
}
|
|
}
|
|
|
|
// GetAppDistribution should be not be called from a DestributionFunction because
|
|
// it could cause a deadlock when updateDistribution is called.
|
|
func (sharding *ClusterSharding) GetAppDistribution() map[string]int {
|
|
sharding.lock.RLock()
|
|
clusters := sharding.Clusters
|
|
apps := sharding.Apps
|
|
sharding.lock.RUnlock()
|
|
|
|
appDistribution := make(map[string]int, len(clusters))
|
|
|
|
for _, a := range apps {
|
|
if _, ok := appDistribution[a.Spec.Destination.Server]; !ok {
|
|
appDistribution[a.Spec.Destination.Server] = 0
|
|
}
|
|
appDistribution[a.Spec.Destination.Server]++
|
|
}
|
|
return appDistribution
|
|
}
|
|
|
|
// UpdateShard will update the shard of ClusterSharding when the shard has changed.
|
|
func (sharding *ClusterSharding) UpdateShard(shard int) bool {
|
|
if shard != sharding.Shard {
|
|
sharding.lock.RLock()
|
|
sharding.Shard = shard
|
|
sharding.lock.RUnlock()
|
|
return true
|
|
}
|
|
return false
|
|
}
|