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]>
120 lines
3.8 KiB
Go
120 lines
3.8 KiB
Go
package askpass
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"sync"
|
|
|
|
"github.com/google/uuid"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
|
|
"github.com/hanzoai/deploy/util/git"
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
)
|
|
|
|
type Server interface {
|
|
git.CredsStore
|
|
AskPassServiceServer
|
|
Run(path string) error
|
|
}
|
|
|
|
// server is a gRPC server that provides a way for an external process (usually git) to access credentials without those
|
|
// credentials being set directly in the git process's environment. Before invoking git, the caller invokes Add to add a
|
|
// new credential, which returns a unique id. The caller then sets the GIT_ASKPASS environment variable to the path of
|
|
// the argocd-git-ask-pass binary and sets the ASKPASS_NONCE environment variable to the id. When git needs credentials,
|
|
// it will invoke the argocd-git-ask-pass binary, which will use the ASKPASS_NONCE to look up the credentials and return
|
|
// them to git. After the git process completes, the caller should invoke Remove to remove the credential.
|
|
//
|
|
// This is meant to solve a class of problems that was demonstrated by an old bug in Kustomize. We needed to enable
|
|
// Kustomize to invoke git to fetch a private repository. But Kustomize had a bug that allowed a user to dump the
|
|
// environment variables of the process into manifests, which would expose the credentials. Kustomize eventually fixed
|
|
// the bug. But to prevent this from happening again, we now only set the ASKPASS_NONCE environment variable instead of
|
|
// directly passing the git credentials via environment variables. Even if the nonce leaks, 1) the user probably doesn't
|
|
// have access to the server to look up the corresponding git credentials, and 2) the nonce should be deleted from
|
|
// the server before the user even sees the manifests.
|
|
type server struct {
|
|
lock sync.Mutex
|
|
creds map[string]Creds
|
|
socketPath string
|
|
}
|
|
|
|
// NewServer returns a new server
|
|
func NewServer(socketPath string) *server {
|
|
return &server{
|
|
creds: make(map[string]Creds),
|
|
socketPath: socketPath,
|
|
}
|
|
}
|
|
|
|
func (s *server) GetCredentials(_ context.Context, q *CredentialsRequest) (*CredentialsResponse, error) {
|
|
if q.Nonce == "" {
|
|
return nil, status.Errorf(codes.InvalidArgument, "missing nonce")
|
|
}
|
|
creds, ok := s.getCreds(q.Nonce)
|
|
if !ok {
|
|
return nil, status.Errorf(codes.NotFound, "unknown nonce")
|
|
}
|
|
return &CredentialsResponse{Username: creds.Username, Password: creds.Password}, nil
|
|
}
|
|
|
|
func (s *server) Start(path string) (utilio.Closer, error) {
|
|
_ = os.Remove(path)
|
|
lc := &net.ListenConfig{}
|
|
listener, err := lc.Listen(context.Background(), "unix", path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
server := grpc.NewServer()
|
|
RegisterAskPassServiceServer(server, s)
|
|
go func() {
|
|
_ = server.Serve(listener)
|
|
}()
|
|
return utilio.NewCloser(listener.Close), nil
|
|
}
|
|
|
|
func (s *server) Run() error {
|
|
_, err := s.Start(s.socketPath)
|
|
return err
|
|
}
|
|
|
|
// Add adds a new credential to the server and returns associated id
|
|
func (s *server) Add(username string, password string) string {
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
id := uuid.New().String()
|
|
s.creds[id] = Creds{
|
|
Username: username,
|
|
Password: password,
|
|
}
|
|
return id
|
|
}
|
|
|
|
// Remove removes the credential with the given id
|
|
func (s *server) Remove(id string) {
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
delete(s.creds, id)
|
|
}
|
|
|
|
func (s *server) getCreds(id string) (*Creds, bool) {
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
creds, ok := s.creds[id]
|
|
return &creds, ok
|
|
}
|
|
|
|
// Environ returns the environment variables that should be set when invoking git.
|
|
func (s *server) Environ(id string) []string {
|
|
return []string{
|
|
"GIT_ASKPASS=argocd",
|
|
fmt.Sprintf("%s=%s", ASKPASS_NONCE_ENV, id),
|
|
"GIT_TERMINAL_PROMPT=0",
|
|
"ARGOCD_BINARY_NAME=argocd-git-ask-pass",
|
|
fmt.Sprintf("%s=%s", AKSPASS_SOCKET_PATH_ENV, s.socketPath),
|
|
}
|
|
}
|