mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +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]>
202 lines
5.7 KiB
Go
202 lines
5.7 KiB
Go
package metrics
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/cache"
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
argoappv1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
metricsutil "github.com/hanzoai/deploy/util/metrics"
|
|
)
|
|
|
|
const (
|
|
metricsCollectionInterval = 30 * time.Second
|
|
metricsCollectionTimeout = 10 * time.Second
|
|
)
|
|
|
|
var (
|
|
descClusterDefaultLabels = []string{"server"}
|
|
|
|
descClusterLabels *prometheus.Desc
|
|
|
|
descClusterInfo = prometheus.NewDesc(
|
|
"argocd_cluster_info",
|
|
"Information about cluster.",
|
|
append(descClusterDefaultLabels, "k8s_version", "name"),
|
|
nil,
|
|
)
|
|
descClusterCacheResources = prometheus.NewDesc(
|
|
"argocd_cluster_api_resource_objects",
|
|
"Number of k8s resource objects in the cache.",
|
|
descClusterDefaultLabels,
|
|
nil,
|
|
)
|
|
descClusterAPIs = prometheus.NewDesc(
|
|
"argocd_cluster_api_resources",
|
|
"Number of monitored kubernetes API resources.",
|
|
descClusterDefaultLabels,
|
|
nil,
|
|
)
|
|
descClusterCacheAgeSeconds = prometheus.NewDesc(
|
|
"argocd_cluster_cache_age_seconds",
|
|
"Cluster cache age in seconds.",
|
|
descClusterDefaultLabels,
|
|
nil,
|
|
)
|
|
descClusterConnectionStatus = prometheus.NewDesc(
|
|
"argocd_cluster_connection_status",
|
|
"The k8s cluster current connection status.",
|
|
append(descClusterDefaultLabels, "k8s_version"),
|
|
nil,
|
|
)
|
|
)
|
|
|
|
type HasClustersInfo interface {
|
|
GetClustersInfo() []cache.ClusterInfo
|
|
}
|
|
|
|
type ClusterLister func(ctx context.Context) (*argoappv1.ClusterList, error)
|
|
|
|
type clusterCollector struct {
|
|
infoSource HasClustersInfo
|
|
lock sync.RWMutex
|
|
clusterLabels []string
|
|
clusterLister ClusterLister
|
|
|
|
latestInfo []*clusterData
|
|
}
|
|
|
|
type clusterData struct {
|
|
info *cache.ClusterInfo
|
|
cluster *argoappv1.Cluster
|
|
}
|
|
|
|
func NewClusterCollector(ctx context.Context, source HasClustersInfo, clusterLister ClusterLister, clusterLabels []string) prometheus.Collector {
|
|
if len(clusterLabels) > 0 {
|
|
normalizedClusterLabels := metricsutil.NormalizeLabels("label", clusterLabels)
|
|
descClusterLabels = prometheus.NewDesc(
|
|
"argocd_cluster_labels",
|
|
"Argo Cluster labels converted to Prometheus labels",
|
|
append(append(descClusterDefaultLabels, "name"), normalizedClusterLabels...),
|
|
nil,
|
|
)
|
|
}
|
|
|
|
collector := &clusterCollector{
|
|
infoSource: source,
|
|
clusterLabels: clusterLabels,
|
|
clusterLister: clusterLister,
|
|
lock: sync.RWMutex{},
|
|
}
|
|
|
|
collector.setClusterData()
|
|
go collector.run(ctx)
|
|
|
|
return collector
|
|
}
|
|
|
|
func (c *clusterCollector) run(ctx context.Context) {
|
|
//nolint:staticcheck // FIXME: complains about SA1015
|
|
tick := time.Tick(metricsCollectionInterval)
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
case <-tick:
|
|
c.setClusterData()
|
|
}
|
|
}
|
|
}
|
|
|
|
func (c *clusterCollector) setClusterData() {
|
|
if clusterData, err := c.getClusterData(); err == nil {
|
|
c.lock.Lock()
|
|
c.latestInfo = clusterData
|
|
c.lock.Unlock()
|
|
} else {
|
|
log.Warnf("error collecting cluster metrics: %v", err)
|
|
}
|
|
}
|
|
|
|
func (c *clusterCollector) getClusterData() ([]*clusterData, error) {
|
|
clusterDatas := []*clusterData{}
|
|
clusterInfos := c.infoSource.GetClustersInfo()
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), metricsCollectionTimeout)
|
|
defer cancel()
|
|
clusters, err := c.clusterLister(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
clusterMap := map[string]*argoappv1.Cluster{}
|
|
for i, cluster := range clusters.Items {
|
|
clusterMap[cluster.Server] = &clusters.Items[i]
|
|
}
|
|
|
|
// Base the cluster data on the ClusterInfo because it only contains the
|
|
// clusters managed by this controller instance
|
|
for i, info := range clusterInfos {
|
|
cluster, ok := clusterMap[info.Server]
|
|
if !ok {
|
|
// This should not happen, but we cannot emit incomplete metrics, so we skip this cluster
|
|
log.WithField("server", info.Server).Warnf("could find cluster for metrics collection")
|
|
continue
|
|
}
|
|
clusterDatas = append(clusterDatas, &clusterData{
|
|
info: &clusterInfos[i],
|
|
cluster: cluster,
|
|
})
|
|
}
|
|
return clusterDatas, nil
|
|
}
|
|
|
|
// Describe implements the prometheus.Collector interface
|
|
func (c *clusterCollector) Describe(ch chan<- *prometheus.Desc) {
|
|
ch <- descClusterInfo
|
|
ch <- descClusterCacheResources
|
|
ch <- descClusterAPIs
|
|
ch <- descClusterCacheAgeSeconds
|
|
ch <- descClusterConnectionStatus
|
|
if len(c.clusterLabels) > 0 {
|
|
ch <- descClusterLabels
|
|
}
|
|
}
|
|
|
|
func (c *clusterCollector) Collect(ch chan<- prometheus.Metric) {
|
|
c.lock.RLock()
|
|
latestInfo := c.latestInfo
|
|
c.lock.RUnlock()
|
|
|
|
now := time.Now()
|
|
for _, clusterData := range latestInfo {
|
|
info := clusterData.info
|
|
name := clusterData.cluster.Name
|
|
labels := clusterData.cluster.Labels
|
|
|
|
defaultValues := []string{info.Server}
|
|
ch <- prometheus.MustNewConstMetric(descClusterInfo, prometheus.GaugeValue, 1, append(defaultValues, info.K8SVersion, name)...)
|
|
ch <- prometheus.MustNewConstMetric(descClusterCacheResources, prometheus.GaugeValue, float64(info.ResourcesCount), defaultValues...)
|
|
ch <- prometheus.MustNewConstMetric(descClusterAPIs, prometheus.GaugeValue, float64(info.APIsCount), defaultValues...)
|
|
cacheAgeSeconds := -1
|
|
if info.LastCacheSyncTime != nil {
|
|
cacheAgeSeconds = int(now.Sub(*info.LastCacheSyncTime).Seconds())
|
|
}
|
|
ch <- prometheus.MustNewConstMetric(descClusterCacheAgeSeconds, prometheus.GaugeValue, float64(cacheAgeSeconds), defaultValues...)
|
|
ch <- prometheus.MustNewConstMetric(descClusterConnectionStatus, prometheus.GaugeValue, boolFloat64(info.SyncError == nil), append(defaultValues, info.K8SVersion)...)
|
|
|
|
if len(c.clusterLabels) > 0 && labels != nil {
|
|
labelValues := []string{}
|
|
labelValues = append(labelValues, info.Server, name)
|
|
for _, desiredLabel := range c.clusterLabels {
|
|
value := labels[desiredLabel]
|
|
labelValues = append(labelValues, value)
|
|
}
|
|
ch <- prometheus.MustNewConstMetric(descClusterLabels, prometheus.GaugeValue, 1, labelValues...)
|
|
}
|
|
}
|
|
}
|