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]>
164 lines
6.5 KiB
Go
164 lines
6.5 KiB
Go
package reposerver
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"crypto/x509"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
|
|
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"
|
|
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/recovery"
|
|
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/health"
|
|
"google.golang.org/grpc/health/grpc_health_v1"
|
|
"google.golang.org/grpc/keepalive"
|
|
"google.golang.org/grpc/reflection"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
versionpkg "github.com/hanzoai/deploy/pkg/apiclient/version"
|
|
"github.com/hanzoai/deploy/reposerver/apiclient"
|
|
reposervercache "github.com/hanzoai/deploy/reposerver/cache"
|
|
"github.com/hanzoai/deploy/reposerver/metrics"
|
|
"github.com/hanzoai/deploy/reposerver/repository"
|
|
"github.com/hanzoai/deploy/server/version"
|
|
"github.com/hanzoai/deploy/util/env"
|
|
"github.com/hanzoai/deploy/util/git"
|
|
grpc_util "github.com/hanzoai/deploy/util/grpc"
|
|
tlsutil "github.com/hanzoai/deploy/util/tls"
|
|
)
|
|
|
|
// ArgoCDRepoServer is the repo server implementation
|
|
type ArgoCDRepoServer struct {
|
|
repoService *repository.Service
|
|
opts []grpc.ServerOption
|
|
tlsConfig *tls.Config
|
|
// healthCheckClientCert is an ephemeral cert generated at startup for the liveness probe self-connection.
|
|
// It is nil when mTLS is not enabled.
|
|
healthCheckClientCert *tls.Certificate
|
|
}
|
|
|
|
// The hostnames to generate self-signed certificates with
|
|
var tlsHostList = []string{"localhost", "reposerver"}
|
|
|
|
// NewServer returns a new instance of the Argo CD Repo server
|
|
func NewServer(metricsServer *metrics.MetricsServer, cache *reposervercache.Cache, tlsConfCustomizer tlsutil.ConfigCustomizer, initConstants repository.RepoServerInitConstants, gitCredsStore git.CredsStore, clientCAPath string, disableTLS bool) (*ArgoCDRepoServer, error) {
|
|
var tlsConfig *tls.Config
|
|
var healthCheckClientCert *tls.Certificate
|
|
|
|
if !disableTLS {
|
|
var err error
|
|
certPath := env.StringFromEnv(common.EnvAppConfigPath, common.DefaultAppConfigPath) + "/reposerver/tls/tls.crt"
|
|
keyPath := env.StringFromEnv(common.EnvAppConfigPath, common.DefaultAppConfigPath) + "/reposerver/tls/tls.key"
|
|
tlsConfig, err = tlsutil.CreateServerTLSConfig(certPath, keyPath, tlsHostList, clientCAPath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error creating server TLS config: %w", err)
|
|
}
|
|
if tlsConfCustomizer != nil {
|
|
tlsConfCustomizer(tlsConfig)
|
|
}
|
|
|
|
// When mTLS is active the server will reject any connection that does not present a valid client cert.
|
|
// The liveness probe connects to localhost, so we generate a dedicated ephemeral cert and register it with the
|
|
// server's ClientCAs pool.
|
|
if clientCAPath != "" && tlsConfig.ClientCAs != nil {
|
|
hcCert, err := tlsutil.GenerateHealthCheckClientCert()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error generating health-check client certificate: %w", err)
|
|
}
|
|
parsedCert, err := x509.ParseCertificate(hcCert.Certificate[0])
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing health-check certificate: %w", err)
|
|
}
|
|
tlsConfig.ClientCAs.AddCert(parsedCert)
|
|
healthCheckClientCert = hcCert
|
|
log.Infof("Generated ephemeral health-check client certificate (CN=%s)", parsedCert.Subject.CommonName)
|
|
}
|
|
}
|
|
// Always ensure ClientAuth is set if we have a CA pool, as we might have customized the config.
|
|
if tlsConfig != nil && tlsConfig.ClientCAs != nil {
|
|
tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
|
|
}
|
|
|
|
var serverMetricsOptions []grpc_prometheus.ServerMetricsOption
|
|
if os.Getenv(common.EnvEnableGRPCTimeHistogramEnv) == "true" {
|
|
serverMetricsOptions = append(serverMetricsOptions, grpc_prometheus.WithServerHandlingTimeHistogram())
|
|
}
|
|
serverMetrics := grpc_prometheus.NewServerMetrics(serverMetricsOptions...)
|
|
metricsServer.PrometheusRegistry.MustRegister(serverMetrics)
|
|
|
|
serverLog := log.NewEntry(log.StandardLogger())
|
|
streamInterceptors := []grpc.StreamServerInterceptor{
|
|
logging.StreamServerInterceptor(grpc_util.InterceptorLogger(serverLog)),
|
|
serverMetrics.StreamServerInterceptor(),
|
|
recovery.StreamServerInterceptor(recovery.WithRecoveryHandler(grpc_util.LoggerRecoveryHandler(serverLog))),
|
|
}
|
|
unaryInterceptors := []grpc.UnaryServerInterceptor{
|
|
logging.UnaryServerInterceptor(grpc_util.InterceptorLogger(serverLog)),
|
|
serverMetrics.UnaryServerInterceptor(),
|
|
recovery.UnaryServerInterceptor(recovery.WithRecoveryHandler(grpc_util.LoggerRecoveryHandler(serverLog))),
|
|
grpc_util.ErrorSanitizerUnaryServerInterceptor(),
|
|
}
|
|
|
|
serverOpts := []grpc.ServerOption{
|
|
grpc.ChainUnaryInterceptor(unaryInterceptors...),
|
|
grpc.ChainStreamInterceptor(streamInterceptors...),
|
|
grpc.MaxRecvMsgSize(apiclient.MaxGRPCMessageSize),
|
|
grpc.MaxSendMsgSize(apiclient.MaxGRPCMessageSize),
|
|
grpc.KeepaliveEnforcementPolicy(
|
|
keepalive.EnforcementPolicy{
|
|
MinTime: common.GetGRPCKeepAliveEnforcementMinimum(),
|
|
},
|
|
),
|
|
grpc.StatsHandler(otelgrpc.NewServerHandler()),
|
|
}
|
|
|
|
// We do allow for non-TLS servers to be created, in case of mTLS will be
|
|
// implemented by e.g. a sidecar container.
|
|
if tlsConfig != nil {
|
|
serverOpts = append(serverOpts, grpc.Creds(credentials.NewTLS(tlsConfig)))
|
|
}
|
|
repoService := repository.NewService(metricsServer, cache, initConstants, gitCredsStore, filepath.Join(os.TempDir(), "_argocd-repo"))
|
|
if err := repoService.Init(); err != nil {
|
|
return nil, fmt.Errorf("failed to initialize the repo service: %w", err)
|
|
}
|
|
|
|
return &ArgoCDRepoServer{
|
|
opts: serverOpts,
|
|
repoService: repoService,
|
|
tlsConfig: tlsConfig,
|
|
healthCheckClientCert: healthCheckClientCert,
|
|
}, nil
|
|
}
|
|
|
|
// CreateGRPC creates new configured grpc server
|
|
func (a *ArgoCDRepoServer) CreateGRPC() *grpc.Server {
|
|
server := grpc.NewServer(a.opts...)
|
|
versionpkg.RegisterVersionServiceServer(server, version.NewServer(nil, func() (bool, error) {
|
|
return true, nil
|
|
}))
|
|
apiclient.RegisterRepoServerServiceServer(server, a.repoService)
|
|
|
|
healthService := health.NewServer()
|
|
grpc_health_v1.RegisterHealthServer(server, healthService)
|
|
|
|
// Register reflection service on gRPC server.
|
|
reflection.Register(server)
|
|
|
|
return server
|
|
}
|
|
|
|
// GetTLSConfig returns the TLS configuration of the server
|
|
func (a *ArgoCDRepoServer) GetTLSConfig() *tls.Config {
|
|
return a.tlsConfig
|
|
}
|
|
|
|
// GetHealthCheckClientCert returns the ephemeral client certificate used by the liveness probe self-connection
|
|
func (a *ArgoCDRepoServer) GetHealthCheckClientCert() *tls.Certificate {
|
|
return a.healthCheckClientCert
|
|
}
|