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
6.5 KiB
Go
202 lines
6.5 KiB
Go
package commands
|
|
|
|
import (
|
|
stderrors "errors"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
"text/tabwriter"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/hanzoai/deploy/cmd/argocd/commands/headless"
|
|
"github.com/hanzoai/deploy/cmd/argocd/commands/utils"
|
|
argocdclient "github.com/hanzoai/deploy/pkg/apiclient"
|
|
gpgkeypkg "github.com/hanzoai/deploy/pkg/apiclient/gpgkey"
|
|
appsv1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
"github.com/hanzoai/deploy/util/templates"
|
|
)
|
|
|
|
// NewGPGCommand returns a new instance of an `argocd repo` command
|
|
func NewGPGCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
command := &cobra.Command{
|
|
Use: "gpg",
|
|
Short: "Manage GPG keys used for signature verification",
|
|
Run: func(c *cobra.Command, args []string) {
|
|
c.HelpFunc()(c, args)
|
|
os.Exit(1)
|
|
},
|
|
Example: ``,
|
|
}
|
|
command.AddCommand(NewGPGListCommand(clientOpts))
|
|
command.AddCommand(NewGPGGetCommand(clientOpts))
|
|
command.AddCommand(NewGPGAddCommand(clientOpts))
|
|
command.AddCommand(NewGPGDeleteCommand(clientOpts))
|
|
return command
|
|
}
|
|
|
|
// NewGPGListCommand lists all configured public keys from the server
|
|
func NewGPGListCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
var output string
|
|
command := &cobra.Command{
|
|
Use: "list",
|
|
Short: "List configured GPG public keys",
|
|
Example: templates.Examples(`
|
|
# List all configured GPG public keys in wide format (default).
|
|
argocd gpg list
|
|
|
|
# List all configured GPG public keys in JSON format.
|
|
argocd gpg list -o json
|
|
|
|
# List all configured GPG public keys in YAML format.
|
|
argocd gpg list -o yaml
|
|
`),
|
|
|
|
Run: func(c *cobra.Command, _ []string) {
|
|
ctx := c.Context()
|
|
|
|
conn, gpgIf := headless.NewClientOrDie(clientOpts, c).NewGPGKeyClientOrDie()
|
|
defer utilio.Close(conn)
|
|
keys, err := gpgIf.List(ctx, &gpgkeypkg.GnuPGPublicKeyQuery{})
|
|
errors.CheckError(err)
|
|
switch output {
|
|
case "yaml", "json":
|
|
err := PrintResourceList(keys.Items, output, false)
|
|
errors.CheckError(err)
|
|
case "wide", "":
|
|
printKeyTable(keys.Items)
|
|
default:
|
|
errors.CheckError(fmt.Errorf("unknown output format: %s", output))
|
|
}
|
|
},
|
|
}
|
|
command.Flags().StringVarP(&output, "output", "o", "wide", "Output format. One of: json|yaml|wide")
|
|
return command
|
|
}
|
|
|
|
// NewGPGGetCommand retrieves a single public key from the server
|
|
func NewGPGGetCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
var output string
|
|
command := &cobra.Command{
|
|
Use: "get KEYID",
|
|
Short: "Get the GPG public key with ID <KEYID> from the server",
|
|
Example: templates.Examples(`
|
|
# Get a GPG public key with the specified KEYID in wide format (default).
|
|
argocd gpg get KEYID
|
|
|
|
# Get a GPG public key with the specified KEYID in JSON format.
|
|
argocd gpg get KEYID -o json
|
|
|
|
# Get a GPG public key with the specified KEYID in YAML format.
|
|
argocd gpg get KEYID -o yaml
|
|
`),
|
|
|
|
Run: func(c *cobra.Command, args []string) {
|
|
ctx := c.Context()
|
|
|
|
if len(args) != 1 {
|
|
errors.Fatal(errors.ErrorGeneric, "Missing KEYID argument")
|
|
}
|
|
conn, gpgIf := headless.NewClientOrDie(clientOpts, c).NewGPGKeyClientOrDie()
|
|
defer utilio.Close(conn)
|
|
key, err := gpgIf.Get(ctx, &gpgkeypkg.GnuPGPublicKeyQuery{KeyID: args[0]})
|
|
errors.CheckError(err)
|
|
switch output {
|
|
case "yaml", "json":
|
|
err := PrintResourceList(key, output, false)
|
|
errors.CheckError(err)
|
|
case "wide", "":
|
|
fmt.Printf("Key ID: %s\n", key.KeyID)
|
|
fmt.Printf("Key fingerprint: %s\n", key.Fingerprint)
|
|
fmt.Printf("Key subtype: %s\n", strings.ToUpper(key.SubType))
|
|
fmt.Printf("Key owner: %s\n", key.Owner)
|
|
fmt.Printf("Key data follows until EOF:\n%s\n", key.KeyData)
|
|
default:
|
|
errors.CheckError(fmt.Errorf("unknown output format: %s", output))
|
|
}
|
|
},
|
|
}
|
|
command.Flags().StringVarP(&output, "output", "o", "wide", "Output format. One of: json|yaml|wide")
|
|
return command
|
|
}
|
|
|
|
// NewGPGAddCommand adds a public key to the server's configuration
|
|
func NewGPGAddCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
var fromFile string
|
|
command := &cobra.Command{
|
|
Use: "add",
|
|
Short: "Adds a GPG public key to the server's keyring",
|
|
Example: templates.Examples(`
|
|
# Add a GPG public key to the server's keyring from a file.
|
|
argocd gpg add --from /path/to/keyfile
|
|
`),
|
|
|
|
Run: func(c *cobra.Command, _ []string) {
|
|
ctx := c.Context()
|
|
|
|
if fromFile == "" {
|
|
errors.CheckError(stderrors.New("--from is mandatory"))
|
|
}
|
|
keyData, err := os.ReadFile(fromFile)
|
|
if err != nil {
|
|
errors.CheckError(err)
|
|
}
|
|
conn, gpgIf := headless.NewClientOrDie(clientOpts, c).NewGPGKeyClientOrDie()
|
|
defer utilio.Close(conn)
|
|
resp, err := gpgIf.Create(ctx, &gpgkeypkg.GnuPGPublicKeyCreateRequest{Publickey: &appsv1.GnuPGPublicKey{KeyData: string(keyData)}})
|
|
errors.CheckError(err)
|
|
fmt.Printf("Created %d key(s) from input file", len(resp.Created.Items))
|
|
if len(resp.Skipped) > 0 {
|
|
fmt.Printf(", and %d key(s) were skipped because they exist already", len(resp.Skipped))
|
|
}
|
|
fmt.Print(".\n")
|
|
},
|
|
}
|
|
command.Flags().StringVarP(&fromFile, "from", "f", "", "Path to the file that contains the GPG public key to import")
|
|
return command
|
|
}
|
|
|
|
// NewGPGDeleteCommand removes a key from the server's keyring
|
|
func NewGPGDeleteCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
command := &cobra.Command{
|
|
Use: "rm KEYID",
|
|
Short: "Removes a GPG public key from the server's keyring",
|
|
Run: func(c *cobra.Command, args []string) {
|
|
ctx := c.Context()
|
|
|
|
if len(args) != 1 {
|
|
errors.Fatal(errors.ErrorGeneric, "Missing KEYID argument")
|
|
}
|
|
|
|
keyId := args[0]
|
|
|
|
conn, gpgIf := headless.NewClientOrDie(clientOpts, c).NewGPGKeyClientOrDie()
|
|
defer utilio.Close(conn)
|
|
|
|
promptUtil := utils.NewPrompt(clientOpts.PromptsEnabled)
|
|
canDelete := promptUtil.Confirm(fmt.Sprintf("Are you sure you want to remove '%s'? [y/n] ", keyId))
|
|
if canDelete {
|
|
_, err := gpgIf.Delete(ctx, &gpgkeypkg.GnuPGPublicKeyQuery{KeyID: keyId})
|
|
errors.CheckError(err)
|
|
fmt.Printf("Deleted key with key ID %s\n", keyId)
|
|
} else {
|
|
fmt.Printf("The command to delete key with key ID '%s' was cancelled.\n", keyId)
|
|
}
|
|
},
|
|
}
|
|
return command
|
|
}
|
|
|
|
// Print table of certificate info
|
|
func printKeyTable(keys []appsv1.GnuPGPublicKey) {
|
|
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
|
|
fmt.Fprint(w, "KEYID\tTYPE\tIDENTITY\n")
|
|
|
|
for _, k := range keys {
|
|
fmt.Fprintf(w, "%s\t%s\t%s\n", k.KeyID, strings.ToUpper(k.SubType), k.Owner)
|
|
}
|
|
_ = w.Flush()
|
|
}
|