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]>
182 lines
5.8 KiB
Go
182 lines
5.8 KiB
Go
package controller
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/cache"
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/utils/kube"
|
|
log "github.com/sirupsen/logrus"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/labels"
|
|
|
|
"github.com/hanzoai/deploy/util/env"
|
|
|
|
"github.com/hanzoai/deploy/controller/metrics"
|
|
appv1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/pkg/client/listers/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/argo"
|
|
appstatecache "github.com/hanzoai/deploy/util/cache/appstate"
|
|
"github.com/hanzoai/deploy/util/db"
|
|
)
|
|
|
|
const (
|
|
defaultSecretUpdateInterval = 10 * time.Second
|
|
|
|
EnvClusterInfoTimeout = "ARGO_CD_UPDATE_CLUSTER_INFO_TIMEOUT"
|
|
)
|
|
|
|
var clusterInfoTimeout = env.ParseDurationFromEnv(EnvClusterInfoTimeout, defaultSecretUpdateInterval, defaultSecretUpdateInterval, 1*time.Minute)
|
|
|
|
type clusterInfoUpdater struct {
|
|
infoSource metrics.HasClustersInfo
|
|
db db.ArgoDB
|
|
appLister v1alpha1.ApplicationNamespaceLister
|
|
cache *appstatecache.Cache
|
|
clusterFilter func(cluster *appv1.Cluster) bool
|
|
projGetter func(app *appv1.Application) (*appv1.AppProject, error)
|
|
namespace string
|
|
lastUpdated time.Time
|
|
}
|
|
|
|
func NewClusterInfoUpdater(
|
|
infoSource metrics.HasClustersInfo,
|
|
db db.ArgoDB,
|
|
appLister v1alpha1.ApplicationNamespaceLister,
|
|
cache *appstatecache.Cache,
|
|
clusterFilter func(cluster *appv1.Cluster) bool,
|
|
projGetter func(app *appv1.Application) (*appv1.AppProject, error),
|
|
namespace string,
|
|
) *clusterInfoUpdater {
|
|
return &clusterInfoUpdater{infoSource, db, appLister, cache, clusterFilter, projGetter, namespace, time.Time{}}
|
|
}
|
|
|
|
func (c *clusterInfoUpdater) Run(ctx context.Context) {
|
|
c.updateClusters()
|
|
ticker := time.NewTicker(clusterInfoTimeout)
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
ticker.Stop()
|
|
return
|
|
case <-ticker.C:
|
|
c.updateClusters()
|
|
}
|
|
}
|
|
}
|
|
|
|
func (c *clusterInfoUpdater) updateClusters() {
|
|
if time.Since(c.lastUpdated) < clusterInfoTimeout {
|
|
return
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), clusterInfoTimeout)
|
|
defer func() {
|
|
cancel()
|
|
c.lastUpdated = time.Now()
|
|
}()
|
|
|
|
infoByServer := make(map[string]*cache.ClusterInfo)
|
|
clustersInfo := c.infoSource.GetClustersInfo()
|
|
for i := range clustersInfo {
|
|
info := clustersInfo[i]
|
|
infoByServer[info.Server] = &info
|
|
}
|
|
clusters, err := c.db.ListClusters(ctx)
|
|
if err != nil {
|
|
log.Warnf("Failed to save clusters info: %v", err)
|
|
return
|
|
}
|
|
var clustersFiltered []appv1.Cluster
|
|
if c.clusterFilter == nil {
|
|
clustersFiltered = clusters.Items
|
|
} else {
|
|
for i := range clusters.Items {
|
|
if c.clusterFilter(&clusters.Items[i]) {
|
|
clustersFiltered = append(clustersFiltered, clusters.Items[i])
|
|
}
|
|
}
|
|
}
|
|
_ = kube.RunAllAsync(len(clustersFiltered), func(i int) error {
|
|
cluster := clustersFiltered[i]
|
|
clusterInfo := infoByServer[cluster.Server]
|
|
if err := c.updateClusterInfo(ctx, cluster, clusterInfo); err != nil {
|
|
log.Warnf("Failed to save cluster info: %v", err)
|
|
} else if err := updateClusterLabels(ctx, clusterInfo, cluster, c.db.UpdateCluster); err != nil {
|
|
log.Warnf("Failed to update cluster labels: %v", err)
|
|
}
|
|
return nil
|
|
})
|
|
log.Debugf("Successfully saved info of %d clusters", len(clustersFiltered))
|
|
}
|
|
|
|
func (c *clusterInfoUpdater) updateClusterInfo(ctx context.Context, cluster appv1.Cluster, info *cache.ClusterInfo) error {
|
|
apps, err := c.appLister.List(labels.Everything())
|
|
if err != nil {
|
|
return fmt.Errorf("error while fetching the apps list: %w", err)
|
|
}
|
|
|
|
updated := c.getUpdatedClusterInfo(ctx, apps, cluster, info, metav1.Now())
|
|
return c.cache.SetClusterInfo(cluster.Server, &updated)
|
|
}
|
|
|
|
func (c *clusterInfoUpdater) getUpdatedClusterInfo(ctx context.Context, apps []*appv1.Application, cluster appv1.Cluster, info *cache.ClusterInfo, now metav1.Time) appv1.ClusterInfo {
|
|
var appCount int64
|
|
for _, a := range apps {
|
|
if c.projGetter != nil {
|
|
proj, err := c.projGetter(a)
|
|
if err != nil || !proj.IsAppNamespacePermitted(a, c.namespace) {
|
|
continue
|
|
}
|
|
}
|
|
destServer, err := argo.GetDestinationServer(ctx, a.Spec.Destination, c.db)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
if destServer == cluster.Server {
|
|
appCount++
|
|
}
|
|
}
|
|
clusterInfo := appv1.ClusterInfo{
|
|
ConnectionState: appv1.ConnectionState{ModifiedAt: &now},
|
|
ApplicationsCount: appCount,
|
|
}
|
|
if info != nil {
|
|
clusterInfo.ServerVersion = info.K8SVersion
|
|
clusterInfo.APIVersions = argo.APIResourcesToStrings(info.APIResources, true)
|
|
switch {
|
|
case info.LastCacheSyncTime == nil:
|
|
clusterInfo.ConnectionState.Status = appv1.ConnectionStatusUnknown
|
|
case info.SyncError == nil:
|
|
clusterInfo.ConnectionState.Status = appv1.ConnectionStatusSuccessful
|
|
syncTime := metav1.NewTime(*info.LastCacheSyncTime)
|
|
clusterInfo.CacheInfo.LastCacheSyncTime = &syncTime
|
|
clusterInfo.CacheInfo.APIsCount = int64(info.APIsCount)
|
|
clusterInfo.CacheInfo.ResourcesCount = int64(info.ResourcesCount)
|
|
default:
|
|
clusterInfo.ConnectionState.Status = appv1.ConnectionStatusFailed
|
|
clusterInfo.ConnectionState.Message = info.SyncError.Error()
|
|
}
|
|
} else {
|
|
clusterInfo.ConnectionState.Status = appv1.ConnectionStatusUnknown
|
|
if appCount == 0 {
|
|
clusterInfo.ConnectionState.Message = "Cluster has no applications and is not being monitored."
|
|
}
|
|
}
|
|
|
|
return clusterInfo
|
|
}
|
|
|
|
func updateClusterLabels(ctx context.Context, clusterInfo *cache.ClusterInfo, cluster appv1.Cluster, updateCluster func(context.Context, *appv1.Cluster) (*appv1.Cluster, error)) error {
|
|
if clusterInfo != nil && cluster.Labels[common.LabelKeyAutoLabelClusterInfo] == "true" && cluster.Labels[common.LabelKeyClusterKubernetesVersion] != clusterInfo.K8SVersion {
|
|
cluster.Labels[common.LabelKeyClusterKubernetesVersion] = clusterInfo.K8SVersion
|
|
_, err := updateCluster(ctx, &cluster)
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|