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]>
211 lines
6.9 KiB
Go
211 lines
6.9 KiB
Go
package apiclient
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"errors"
|
|
"fmt"
|
|
"math"
|
|
"os"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
"github.com/hanzoai/deploy/util/env"
|
|
utiltls "github.com/hanzoai/deploy/util/tls"
|
|
|
|
grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry"
|
|
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/timeout"
|
|
log "github.com/sirupsen/logrus"
|
|
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/credentials"
|
|
"google.golang.org/grpc/credentials/insecure"
|
|
|
|
grpc_util "github.com/hanzoai/deploy/util/grpc"
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
)
|
|
|
|
// MaxGRPCMessageSize contains max grpc message size
|
|
var MaxGRPCMessageSize = env.ParseNumFromEnv(common.EnvGRPCMaxSizeMB, 100, 0, math.MaxInt32) * 1024 * 1024
|
|
|
|
// Clientset represents repository server api clients
|
|
type Clientset interface {
|
|
NewRepoServerClient() (utilio.Closer, RepoServerServiceClient, error)
|
|
}
|
|
|
|
type clientSet struct {
|
|
address string
|
|
timeoutSeconds int
|
|
tlsConfig utiltls.Configuration
|
|
}
|
|
|
|
type clientCertEntry struct {
|
|
cert tls.Certificate
|
|
certModTime time.Time
|
|
keyModTime time.Time
|
|
}
|
|
|
|
var clientCertCache = struct {
|
|
mu sync.RWMutex
|
|
entries map[string]*clientCertEntry
|
|
}{
|
|
entries: map[string]*clientCertEntry{},
|
|
}
|
|
|
|
// ResetClientCertCache clears the client certificate cache. // Intended for tests.
|
|
func ResetClientCertCache() {
|
|
clientCertCache.mu.Lock()
|
|
defer clientCertCache.mu.Unlock()
|
|
clear(clientCertCache.entries)
|
|
}
|
|
|
|
func getClientCertFromCache(certFile, keyFile string) (tls.Certificate, error) {
|
|
cacheKey := certFile + "\x00" + keyFile
|
|
|
|
// Stat both files before acquiring the write lock.
|
|
// os.Stat is cheap; we do it outside the lock to minimise contention.
|
|
certInfo, err := os.Stat(certFile)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("cannot stat client cert file %s: %w", certFile, err)
|
|
}
|
|
keyInfo, err := os.Stat(keyFile)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("cannot stat client cert key file %s: %w", keyFile, err)
|
|
}
|
|
|
|
// Fast path: read lock, return cached cert if still fresh.
|
|
clientCertCache.mu.RLock()
|
|
if entry, ok := clientCertCache.entries[cacheKey]; ok {
|
|
if !certInfo.ModTime().After(entry.certModTime) && !keyInfo.ModTime().After(entry.keyModTime) {
|
|
cert := entry.cert
|
|
clientCertCache.mu.RUnlock()
|
|
return cert, nil
|
|
}
|
|
}
|
|
clientCertCache.mu.RUnlock()
|
|
|
|
// Slow path: files changed or not yet cached — reload from disk.
|
|
cert, err := tls.LoadX509KeyPair(certFile, keyFile)
|
|
if err != nil {
|
|
return tls.Certificate{}, fmt.Errorf("failed to load client certificate: %w", err)
|
|
}
|
|
|
|
clientCertCache.mu.Lock()
|
|
// Double-check: another goroutine may have loaded between our RUnlock and Lock.
|
|
if entry, ok := clientCertCache.entries[cacheKey]; ok {
|
|
if !certInfo.ModTime().After(entry.certModTime) && !keyInfo.ModTime().After(entry.keyModTime) {
|
|
cert := entry.cert
|
|
clientCertCache.mu.Unlock()
|
|
return cert, nil
|
|
}
|
|
}
|
|
clientCertCache.entries[cacheKey] = &clientCertEntry{
|
|
cert: cert,
|
|
certModTime: certInfo.ModTime(),
|
|
keyModTime: keyInfo.ModTime(),
|
|
}
|
|
clientCertCache.mu.Unlock()
|
|
|
|
log.Infof("Client certificate reloaded from %s (mtime changed)", certFile)
|
|
return cert, nil
|
|
}
|
|
|
|
func (c *clientSet) NewRepoServerClient() (utilio.Closer, RepoServerServiceClient, error) {
|
|
conn, err := NewConnection(c.address, c.timeoutSeconds, &c.tlsConfig)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("failed to open a new connection to repo server: %w", err)
|
|
}
|
|
return conn, NewRepoServerServiceClient(conn), nil
|
|
}
|
|
|
|
func NewConnection(address string, timeoutSeconds int, tlsConfig *utiltls.Configuration) (*grpc.ClientConn, error) {
|
|
retryOpts := []grpc_retry.CallOption{
|
|
grpc_retry.WithMax(3),
|
|
grpc_retry.WithBackoff(grpc_retry.BackoffLinear(1000 * time.Millisecond)),
|
|
}
|
|
unaryInterceptors := []grpc.UnaryClientInterceptor{grpc_retry.UnaryClientInterceptor(retryOpts...)}
|
|
if timeoutSeconds > 0 {
|
|
unaryInterceptors = append(unaryInterceptors, timeout.UnaryClientInterceptor(time.Duration(timeoutSeconds)*time.Second))
|
|
}
|
|
opts := []grpc.DialOption{
|
|
grpc.WithStreamInterceptor(grpc_util.RetryOnlyForServerStreamInterceptor(retryOpts...)),
|
|
grpc.WithChainUnaryInterceptor(unaryInterceptors...),
|
|
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(MaxGRPCMessageSize), grpc.MaxCallSendMsgSize(MaxGRPCMessageSize)),
|
|
grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
|
|
}
|
|
|
|
if tlsConfig.DisableTLS {
|
|
opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
|
} else {
|
|
tlsC, err := buildTLSClientConfig(tlsConfig)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
opts = append(opts, grpc.WithTransportCredentials(credentials.NewTLS(tlsC)))
|
|
}
|
|
|
|
conn, err := grpc.NewClient(address, opts...)
|
|
if err != nil {
|
|
log.Errorf("Unable to connect to repository service with address %s", address)
|
|
return nil, err
|
|
}
|
|
return conn, nil
|
|
}
|
|
|
|
// NewRepoServerClientset creates new instance of repo server Clientset
|
|
func NewRepoServerClientset(address string, timeoutSeconds int, tlsConfig utiltls.Configuration) Clientset {
|
|
return &clientSet{
|
|
address: address,
|
|
timeoutSeconds: timeoutSeconds,
|
|
tlsConfig: tlsConfig,
|
|
}
|
|
}
|
|
|
|
func buildTLSClientConfig(tlsConfig *utiltls.Configuration) (*tls.Config, error) {
|
|
tlsC := &tls.Config{}
|
|
|
|
strictValidation := tlsConfig.StrictValidation || tlsConfig.Certificates != nil
|
|
if !strictValidation {
|
|
tlsC.InsecureSkipVerify = true
|
|
} else {
|
|
tlsC.RootCAs = tlsConfig.Certificates
|
|
}
|
|
|
|
if tlsConfig.ClientCertFile != "" && tlsConfig.ClientCertKeyFile != "" {
|
|
certFile := tlsConfig.ClientCertFile
|
|
keyFile := tlsConfig.ClientCertKeyFile
|
|
|
|
// Check whether the cert files actually exist before installing the callback. If they don't, mTLS is skipped.
|
|
if _, err := os.Stat(certFile); err != nil {
|
|
if !errors.Is(err, os.ErrNotExist) {
|
|
return nil, fmt.Errorf("could not stat client cert file %s: %w", certFile, err)
|
|
}
|
|
log.Debugf("Client cert file %s does not exist — skipping mTLS client certificate", certFile)
|
|
} else {
|
|
// File exists: do an eager load to catch configuration errors at startup.
|
|
if _, err := getClientCertFromCache(certFile, keyFile); err != nil {
|
|
return nil, fmt.Errorf("failed to load initial client certificate: %w", err)
|
|
}
|
|
|
|
tlsC.GetClientCertificate = func(_ *tls.CertificateRequestInfo) (*tls.Certificate, error) {
|
|
if _, statErr := os.Stat(certFile); statErr != nil {
|
|
if errors.Is(statErr, os.ErrNotExist) {
|
|
log.Debugf("Client cert file %s no longer exists — skipping mTLS client certificate", certFile)
|
|
return new(tls.Certificate), nil
|
|
}
|
|
return nil, fmt.Errorf("could not stat client cert file %s: %w", certFile, statErr)
|
|
}
|
|
cert, err := getClientCertFromCache(certFile, keyFile)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &cert, nil
|
|
}
|
|
}
|
|
} else if len(tlsConfig.ClientCertificates) > 0 {
|
|
tlsC.Certificates = tlsConfig.ClientCertificates
|
|
}
|
|
|
|
return tlsC, nil
|
|
}
|