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]>
373 lines
12 KiB
Go
373 lines
12 KiB
Go
package commands
|
|
|
|
import (
|
|
"crypto/sha256"
|
|
"crypto/x509"
|
|
"encoding/hex"
|
|
stderrors "errors"
|
|
"fmt"
|
|
"os"
|
|
"sort"
|
|
"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"
|
|
certificatepkg "github.com/hanzoai/deploy/pkg/apiclient/certificate"
|
|
appsv1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
certutil "github.com/hanzoai/deploy/util/cert"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
)
|
|
|
|
// NewCertCommand returns a new instance of an `argocd repo` command
|
|
func NewCertCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
command := &cobra.Command{
|
|
Use: "cert",
|
|
Short: "Manage repository certificates and SSH known hosts entries",
|
|
Run: func(c *cobra.Command, args []string) {
|
|
c.HelpFunc()(c, args)
|
|
os.Exit(1)
|
|
},
|
|
Example: ` # Add a TLS certificate for cd.example.com to ArgoCD cert store from a file
|
|
argocd cert add-tls --from ~/mycert.pem cd.example.com
|
|
|
|
# Add a TLS certificate for cd.example.com to ArgoCD via stdin
|
|
cat ~/mycert.pem | argocd cert add-tls cd.example.com
|
|
|
|
# Add SSH known host entries for cd.example.com to ArgoCD by scanning host
|
|
ssh-keyscan cd.example.com | argocd cert add-ssh --batch
|
|
|
|
# List all known TLS certificates
|
|
argocd cert list --cert-type https
|
|
|
|
# Remove all TLS certificates for cd.example.com
|
|
argocd cert rm --cert-type https cd.example.com
|
|
|
|
# Remove all certificates and SSH known host entries for cd.example.com
|
|
argocd cert rm cd.example.com
|
|
`,
|
|
}
|
|
|
|
command.AddCommand(NewCertAddSSHCommand(clientOpts))
|
|
command.AddCommand(NewCertAddTLSCommand(clientOpts))
|
|
command.AddCommand(NewCertListCommand(clientOpts))
|
|
command.AddCommand(NewCertRemoveCommand(clientOpts))
|
|
return command
|
|
}
|
|
|
|
func NewCertAddTLSCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
var (
|
|
fromFile string
|
|
upsert bool
|
|
)
|
|
|
|
command := &cobra.Command{
|
|
Use: "add-tls SERVERNAME",
|
|
Short: "Add TLS certificate data for connecting to repository server SERVERNAME",
|
|
Run: func(c *cobra.Command, args []string) {
|
|
ctx := c.Context()
|
|
|
|
conn, certIf := headless.NewClientOrDie(clientOpts, c).NewCertClientOrDie()
|
|
defer utilio.Close(conn)
|
|
|
|
if len(args) != 1 {
|
|
c.HelpFunc()(c, args)
|
|
os.Exit(1)
|
|
}
|
|
|
|
var (
|
|
certificateArray []string
|
|
err error
|
|
)
|
|
|
|
if fromFile != "" {
|
|
fmt.Printf("Reading TLS certificate data in PEM format from '%s'\n", fromFile)
|
|
certificateArray, err = certutil.ParseTLSCertificatesFromPath(fromFile)
|
|
} else {
|
|
fmt.Println("Enter TLS certificate data in PEM format. Press CTRL-D when finished.")
|
|
certificateArray, err = certutil.ParseTLSCertificatesFromStream(os.Stdin)
|
|
}
|
|
errors.CheckError(err)
|
|
|
|
uniqueCerts, err := deduplicatePEMCertificates(certificateArray)
|
|
errors.CheckError(err)
|
|
|
|
if len(uniqueCerts) == 0 {
|
|
fmt.Println("No valid certificates have been detected in the stream.")
|
|
return
|
|
}
|
|
|
|
serverName := args[0]
|
|
|
|
certificateList := []appsv1.RepositoryCertificate{
|
|
{
|
|
ServerName: serverName,
|
|
CertType: "https",
|
|
CertData: []byte(strings.Join(uniqueCerts, "\n")),
|
|
},
|
|
}
|
|
|
|
_, err = certIf.CreateCertificate(
|
|
ctx,
|
|
&certificatepkg.RepositoryCertificateCreateRequest{
|
|
Certificates: &appsv1.RepositoryCertificateList{
|
|
Items: certificateList,
|
|
},
|
|
Upsert: upsert,
|
|
},
|
|
)
|
|
errors.CheckError(err)
|
|
|
|
fmt.Printf(
|
|
"Created/updated TLS certificate entry for repository server %s with %d unique PEM certificates\n",
|
|
serverName,
|
|
len(uniqueCerts),
|
|
)
|
|
},
|
|
}
|
|
command.Flags().StringVar(&fromFile, "from", "", "Read TLS certificate data from file (default is to read from stdin)")
|
|
command.Flags().BoolVar(&upsert, "upsert", false, "Replace existing TLS certificate if certificate is different in input")
|
|
return command
|
|
}
|
|
|
|
// certFingerprintSHA256 returns the SHA256 fingerprint of the given X.509 certificate.
|
|
// The fingerprint is returned as a lowercase hexadecimal string.
|
|
func certFingerprintSHA256(cert *x509.Certificate) string {
|
|
sum := sha256.Sum256(cert.Raw)
|
|
return hex.EncodeToString(sum[:])
|
|
}
|
|
|
|
// deduplicatePEMCertificates removes duplicate PEM certificates from the input slice.
|
|
// Two certificates are considered duplicates if their SHA256 fingerprints match.
|
|
// The function returns a slice of unique certificates in the original order.
|
|
// If any certificate cannot be decoded into X.509 format, an error is returned.
|
|
func deduplicatePEMCertificates(pems []string) ([]string, error) {
|
|
fingerprintMap := make(map[string]struct{})
|
|
uniqueCerts := make([]string, 0)
|
|
|
|
for _, entry := range pems {
|
|
x509cert, err := certutil.DecodePEMCertificateToX509(entry)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
fingerprint := certFingerprintSHA256(x509cert)
|
|
|
|
if _, exists := fingerprintMap[fingerprint]; exists {
|
|
fmt.Printf(
|
|
"WARNING: Duplicate certificate detected (SHA256 fingerprint %s, subject '%s'), skipping.\n",
|
|
fingerprint,
|
|
x509cert.Subject.String(),
|
|
)
|
|
continue
|
|
}
|
|
|
|
fingerprintMap[fingerprint] = struct{}{}
|
|
uniqueCerts = append(uniqueCerts, entry)
|
|
}
|
|
|
|
return uniqueCerts, nil
|
|
}
|
|
|
|
// NewCertAddSSHCommand returns a new instance of an `argocd cert add` command
|
|
func NewCertAddSSHCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
var (
|
|
fromFile string
|
|
batchProcess bool
|
|
upsert bool
|
|
certificates []appsv1.RepositoryCertificate
|
|
)
|
|
|
|
command := &cobra.Command{
|
|
Use: "add-ssh --batch",
|
|
Short: "Add SSH known host entries for repository servers",
|
|
Run: func(c *cobra.Command, _ []string) {
|
|
ctx := c.Context()
|
|
|
|
conn, certIf := headless.NewClientOrDie(clientOpts, c).NewCertClientOrDie()
|
|
defer utilio.Close(conn)
|
|
|
|
var sshKnownHostsLists []string
|
|
var err error
|
|
|
|
// --batch is a flag, but it is mandatory for now.
|
|
if batchProcess {
|
|
if fromFile != "" {
|
|
fmt.Printf("Reading SSH known hosts entries from file '%s'\n", fromFile)
|
|
sshKnownHostsLists, err = certutil.ParseSSHKnownHostsFromPath(fromFile)
|
|
} else {
|
|
fmt.Println("Enter SSH known hosts entries, one per line. Press CTRL-D when finished.")
|
|
sshKnownHostsLists, err = certutil.ParseSSHKnownHostsFromStream(os.Stdin)
|
|
}
|
|
} else {
|
|
err = stderrors.New("you need to specify --batch or specify --help for usage instructions")
|
|
}
|
|
|
|
errors.CheckError(err)
|
|
|
|
if len(sshKnownHostsLists) == 0 {
|
|
errors.Fatal(errors.ErrorGeneric, "No valid SSH known hosts data found.")
|
|
}
|
|
|
|
for _, knownHostsEntry := range sshKnownHostsLists {
|
|
_, certSubType, certData, err := certutil.TokenizeSSHKnownHostsEntry(knownHostsEntry)
|
|
errors.CheckError(err)
|
|
hostnameList, _, err := certutil.KnownHostsLineToPublicKey(knownHostsEntry)
|
|
errors.CheckError(err)
|
|
// Each key could be valid for multiple hostnames
|
|
for _, hostname := range hostnameList {
|
|
certificate := appsv1.RepositoryCertificate{
|
|
ServerName: hostname,
|
|
CertType: "ssh",
|
|
CertSubType: certSubType,
|
|
CertData: certData,
|
|
}
|
|
certificates = append(certificates, certificate)
|
|
}
|
|
}
|
|
|
|
certList := &appsv1.RepositoryCertificateList{Items: certificates}
|
|
response, err := certIf.CreateCertificate(ctx, &certificatepkg.RepositoryCertificateCreateRequest{
|
|
Certificates: certList,
|
|
Upsert: upsert,
|
|
})
|
|
errors.CheckError(err)
|
|
fmt.Printf("Successfully created %d SSH known host entries\n", len(response.Items))
|
|
},
|
|
}
|
|
command.Flags().StringVar(&fromFile, "from", "", "Read SSH known hosts data from file (default is to read from stdin)")
|
|
command.Flags().BoolVar(&batchProcess, "batch", false, "Perform batch processing by reading in SSH known hosts data (mandatory flag)")
|
|
command.Flags().BoolVar(&upsert, "upsert", false, "Replace existing SSH server public host keys if key is different in input")
|
|
return command
|
|
}
|
|
|
|
// NewCertRemoveCommand returns a new instance of an `argocd cert rm` command
|
|
func NewCertRemoveCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
var (
|
|
certType string
|
|
certSubType string
|
|
certQuery certificatepkg.RepositoryCertificateQuery
|
|
)
|
|
command := &cobra.Command{
|
|
Use: "rm REPOSERVER",
|
|
Short: "Remove certificate of TYPE for REPOSERVER",
|
|
Run: func(c *cobra.Command, args []string) {
|
|
ctx := c.Context()
|
|
|
|
if len(args) < 1 {
|
|
c.HelpFunc()(c, args)
|
|
os.Exit(1)
|
|
}
|
|
conn, certIf := headless.NewClientOrDie(clientOpts, c).NewCertClientOrDie()
|
|
defer utilio.Close(conn)
|
|
hostNamePattern := args[0]
|
|
|
|
// Prevent the user from specifying a wildcard as hostname as precaution
|
|
// measure -- the user could still use "?*" or any other pattern to
|
|
// remove all certificates, but it's less likely that it happens by
|
|
// accident.
|
|
if hostNamePattern == "*" {
|
|
errors.Fatal(errors.ErrorGeneric, "A single wildcard is not allowed as REPOSERVER name.")
|
|
}
|
|
|
|
promptUtil := utils.NewPrompt(clientOpts.PromptsEnabled)
|
|
canDelete := promptUtil.Confirm(fmt.Sprintf("Are you sure you want to remove all certificates for '%s'? [y/n]", hostNamePattern))
|
|
if canDelete {
|
|
certQuery = certificatepkg.RepositoryCertificateQuery{
|
|
HostNamePattern: hostNamePattern,
|
|
CertType: certType,
|
|
CertSubType: certSubType,
|
|
}
|
|
removed, err := certIf.DeleteCertificate(ctx, &certQuery)
|
|
errors.CheckError(err)
|
|
if len(removed.Items) > 0 {
|
|
for _, cert := range removed.Items {
|
|
fmt.Printf("Removed cert for '%s' of type '%s' (subtype '%s')\n", cert.ServerName, cert.CertType, cert.CertSubType)
|
|
}
|
|
} else {
|
|
fmt.Println("No certificates were removed (none matched the given pattern)")
|
|
}
|
|
} else {
|
|
fmt.Printf("The command to remove all certificates for '%s' was cancelled.\n", hostNamePattern)
|
|
}
|
|
},
|
|
}
|
|
command.Flags().StringVar(&certType, "cert-type", "", "Only remove certs of given type (ssh, https)")
|
|
command.Flags().StringVar(&certSubType, "cert-sub-type", "", "Only remove certs of given sub-type (only for ssh)")
|
|
return command
|
|
}
|
|
|
|
// NewCertListCommand returns a new instance of an `argocd cert rm` command
|
|
func NewCertListCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
var (
|
|
certType string
|
|
hostNamePattern string
|
|
sortOrder string
|
|
output string
|
|
)
|
|
command := &cobra.Command{
|
|
Use: "list",
|
|
Short: "List configured certificates",
|
|
Run: func(c *cobra.Command, _ []string) {
|
|
ctx := c.Context()
|
|
|
|
if certType != "" {
|
|
switch certType {
|
|
case "ssh":
|
|
case "https":
|
|
default:
|
|
fmt.Println("cert-type must be either ssh or https")
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
conn, certIf := headless.NewClientOrDie(clientOpts, c).NewCertClientOrDie()
|
|
defer utilio.Close(conn)
|
|
certificates, err := certIf.ListCertificates(ctx, &certificatepkg.RepositoryCertificateQuery{HostNamePattern: hostNamePattern, CertType: certType})
|
|
errors.CheckError(err)
|
|
|
|
switch output {
|
|
case "yaml", "json":
|
|
err := PrintResourceList(certificates.Items, output, false)
|
|
errors.CheckError(err)
|
|
case "wide", "":
|
|
printCertTable(certificates.Items, sortOrder)
|
|
default:
|
|
errors.CheckError(fmt.Errorf("unknown output format: %s", output))
|
|
}
|
|
},
|
|
}
|
|
|
|
command.Flags().StringVarP(&output, "output", "o", "wide", "Output format. One of: json|yaml|wide")
|
|
command.Flags().StringVar(&sortOrder, "sort", "", "Set display sort order for output format wide. One of: hostname|type")
|
|
command.Flags().StringVar(&certType, "cert-type", "", "Only list certificates of given type, valid: 'ssh','https'")
|
|
command.Flags().StringVar(&hostNamePattern, "hostname-pattern", "", "Only list certificates for hosts matching given glob-pattern")
|
|
return command
|
|
}
|
|
|
|
// Print table of certificate info
|
|
func printCertTable(certs []appsv1.RepositoryCertificate, sortOrder string) {
|
|
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
|
|
fmt.Fprint(w, "HOSTNAME\tTYPE\tSUBTYPE\tINFO\n")
|
|
|
|
switch sortOrder {
|
|
case "hostname", "":
|
|
sort.Slice(certs, func(i, j int) bool {
|
|
return certs[i].ServerName < certs[j].ServerName
|
|
})
|
|
case "type":
|
|
sort.Slice(certs, func(i, j int) bool {
|
|
return certs[i].CertType < certs[j].CertType
|
|
})
|
|
}
|
|
|
|
for _, c := range certs {
|
|
fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", c.ServerName, c.CertType, c.CertSubType, c.CertInfo)
|
|
}
|
|
_ = w.Flush()
|
|
}
|