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]>
245 lines
5.9 KiB
Go
245 lines
5.9 KiB
Go
package cache
|
|
|
|
import (
|
|
"bytes"
|
|
"compress/gzip"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/hanzoai/deploy/util/env"
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
|
|
rediscache "github.com/go-redis/cache/v9"
|
|
"github.com/redis/go-redis/v9"
|
|
)
|
|
|
|
type RedisCompressionType string
|
|
|
|
var (
|
|
RedisCompressionNone RedisCompressionType = "none"
|
|
RedisCompressionGZip RedisCompressionType = "gzip"
|
|
)
|
|
|
|
const (
|
|
// envRedisKeyPrefix is an env variable name which stores the prefix for redis keys
|
|
envRedisKeyPrefix = "ARGOCD_REDIS_KEY_PREFIX"
|
|
)
|
|
|
|
func CompressionTypeFromString(s string) (RedisCompressionType, error) {
|
|
switch s {
|
|
case string(RedisCompressionNone):
|
|
return RedisCompressionNone, nil
|
|
case string(RedisCompressionGZip):
|
|
return RedisCompressionGZip, nil
|
|
}
|
|
return "", fmt.Errorf("unknown compression type: %s", s)
|
|
}
|
|
|
|
func NewRedisCache(client *redis.Client, expiration time.Duration, compressionType RedisCompressionType) CacheClient {
|
|
return &redisCache{
|
|
client: client,
|
|
expiration: expiration,
|
|
cache: rediscache.New(&rediscache.Options{Redis: client}),
|
|
redisCompressionType: compressionType,
|
|
prefix: env.StringFromEnv(envRedisKeyPrefix, ""),
|
|
}
|
|
}
|
|
|
|
// compile-time validation of adherence of the CacheClient contract
|
|
var _ CacheClient = &redisCache{}
|
|
|
|
type redisCache struct {
|
|
expiration time.Duration
|
|
client *redis.Client
|
|
cache *rediscache.Cache
|
|
redisCompressionType RedisCompressionType
|
|
// prefix is added to all keys stored in redis
|
|
prefix string
|
|
}
|
|
|
|
func (r *redisCache) getKey(key string) string {
|
|
prefixedKey := r.prefix + key
|
|
switch r.redisCompressionType {
|
|
case RedisCompressionGZip:
|
|
return prefixedKey + ".gz"
|
|
default:
|
|
return prefixedKey
|
|
}
|
|
}
|
|
|
|
func (r *redisCache) marshal(obj any) ([]byte, error) {
|
|
buf := bytes.NewBuffer([]byte{})
|
|
var w io.Writer = buf
|
|
if r.redisCompressionType == RedisCompressionGZip {
|
|
w = gzip.NewWriter(buf)
|
|
}
|
|
encoder := json.NewEncoder(w)
|
|
|
|
if err := encoder.Encode(obj); err != nil {
|
|
return nil, err
|
|
}
|
|
if flusher, ok := w.(interface{ Flush() error }); ok {
|
|
if err := flusher.Flush(); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
if closer, ok := w.(interface{ Close() error }); ok {
|
|
if err := closer.Close(); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return buf.Bytes(), nil
|
|
}
|
|
|
|
func (r *redisCache) unmarshal(data []byte, obj any) error {
|
|
buf := bytes.NewReader(data)
|
|
var reader io.Reader = buf
|
|
if r.redisCompressionType == RedisCompressionGZip {
|
|
gzipReader, err := gzip.NewReader(buf)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
reader = gzipReader
|
|
}
|
|
if err := json.NewDecoder(reader).Decode(obj); err != nil {
|
|
return fmt.Errorf("failed to decode cached data: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (r *redisCache) Rename(oldKey string, newKey string, _ time.Duration) error {
|
|
err := r.client.Rename(context.TODO(), r.getKey(oldKey), r.getKey(newKey)).Err()
|
|
if err != nil && err.Error() == "ERR no such key" {
|
|
err = ErrCacheMiss
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func (r *redisCache) Set(item *Item) error {
|
|
expiration := item.CacheActionOpts.Expiration
|
|
if expiration == 0 {
|
|
expiration = r.expiration
|
|
}
|
|
|
|
val, err := r.marshal(item.Object)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return r.cache.Set(&rediscache.Item{
|
|
Key: r.getKey(item.Key),
|
|
Value: val,
|
|
TTL: expiration,
|
|
SetNX: item.CacheActionOpts.DisableOverwrite,
|
|
})
|
|
}
|
|
|
|
func (r *redisCache) Get(key string, obj any) error {
|
|
var data []byte
|
|
err := r.cache.Get(context.TODO(), r.getKey(key), &data)
|
|
if errors.Is(err, rediscache.ErrCacheMiss) {
|
|
err = ErrCacheMiss
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return r.unmarshal(data, obj)
|
|
}
|
|
|
|
func (r *redisCache) Delete(key string) error {
|
|
return r.cache.Delete(context.TODO(), r.getKey(key))
|
|
}
|
|
|
|
func (r *redisCache) OnUpdated(ctx context.Context, key string, callback func() error) error {
|
|
pubsub := r.client.Subscribe(ctx, key)
|
|
defer utilio.Close(pubsub)
|
|
|
|
ch := pubsub.Channel()
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
return nil
|
|
case <-ch:
|
|
if err := callback(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func (r *redisCache) NotifyUpdated(key string) error {
|
|
return r.client.Publish(context.TODO(), key, "").Err()
|
|
}
|
|
|
|
type MetricsRegistry interface {
|
|
IncRedisRequest(failed bool)
|
|
ObserveRedisRequestDuration(duration time.Duration)
|
|
}
|
|
|
|
type redisHook struct {
|
|
registry MetricsRegistry
|
|
}
|
|
|
|
// ignoredRedisCommandNames are commands that go-redis may issue during connection setup / bookkeeping
|
|
// and which we don't want to count as application-level requests in metrics.
|
|
var ignoredRedisCommandNames = map[string]struct{}{
|
|
"hello": {},
|
|
"client": {},
|
|
// Optional: we can enable if we want also want to exclude other setup/noise commands.
|
|
// "auth": {},
|
|
// "select": {},
|
|
// "ping": {},
|
|
}
|
|
|
|
func shouldIgnoreRedisCmd(cmd redis.Cmder) bool {
|
|
name := strings.ToLower(strings.TrimSpace(cmd.Name()))
|
|
_, ok := ignoredRedisCommandNames[name]
|
|
return ok
|
|
}
|
|
|
|
func (rh *redisHook) DialHook(next redis.DialHook) redis.DialHook {
|
|
return func(ctx context.Context, network, addr string) (net.Conn, error) {
|
|
conn, err := next(ctx, network, addr)
|
|
return conn, err
|
|
}
|
|
}
|
|
|
|
func (rh *redisHook) ProcessHook(next redis.ProcessHook) redis.ProcessHook {
|
|
return func(ctx context.Context, cmd redis.Cmder) error {
|
|
startTime := time.Now()
|
|
|
|
err := next(ctx, cmd)
|
|
|
|
if shouldIgnoreRedisCmd(cmd) {
|
|
return err
|
|
}
|
|
|
|
rh.registry.IncRedisRequest(err != nil && !errors.Is(err, redis.Nil))
|
|
rh.registry.ObserveRedisRequestDuration(time.Since(startTime))
|
|
|
|
return err
|
|
}
|
|
}
|
|
|
|
func (redisHook) ProcessPipelineHook(_ redis.ProcessPipelineHook) redis.ProcessPipelineHook {
|
|
return nil
|
|
}
|
|
|
|
// CollectMetrics add transport wrapper that pushes metrics into the specified metrics registry
|
|
// Lock should be shared between functions that can add/process a Redis hook.
|
|
func CollectMetrics(client *redis.Client, registry MetricsRegistry, lock *sync.RWMutex) {
|
|
if lock != nil {
|
|
lock.Lock()
|
|
defer lock.Unlock()
|
|
}
|
|
client.AddHook(&redisHook{registry: registry})
|
|
}
|