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]>
139 lines
4.2 KiB
Go
139 lines
4.2 KiB
Go
package commands
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"errors"
|
|
"fmt"
|
|
"net/http"
|
|
"os"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/hanzoai/deploy/cmd/argocd/commands/utils"
|
|
"github.com/hanzoai/deploy/common"
|
|
argocdclient "github.com/hanzoai/deploy/pkg/apiclient"
|
|
"github.com/hanzoai/deploy/util/cli"
|
|
errutil "github.com/hanzoai/deploy/util/errors"
|
|
grpc_util "github.com/hanzoai/deploy/util/grpc"
|
|
"github.com/hanzoai/deploy/util/localconfig"
|
|
)
|
|
|
|
// NewLogoutCommand returns a new instance of `argocd logout` command
|
|
func NewLogoutCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
|
|
command := &cobra.Command{
|
|
Use: "logout CONTEXT",
|
|
Short: "Log out from Argo CD",
|
|
Long: "Log out from Argo CD",
|
|
Example: `# Logout from the active Argo CD context
|
|
# This can be helpful for security reasons or when you want to switch between different Argo CD contexts or accounts.
|
|
argocd logout CONTEXT
|
|
|
|
# Logout from a specific context named 'cd.argoproj.io'
|
|
argocd logout cd.argoproj.io
|
|
`,
|
|
Run: func(c *cobra.Command, args []string) {
|
|
if len(args) == 0 {
|
|
c.HelpFunc()(c, args)
|
|
os.Exit(1)
|
|
}
|
|
context := args[0]
|
|
|
|
localCfg, err := localconfig.ReadLocalConfig(clientOpts.ConfigPath)
|
|
errutil.CheckError(err)
|
|
if localCfg == nil {
|
|
log.Fatal("Nothing to logout from")
|
|
}
|
|
|
|
promptUtil := utils.NewPrompt(clientOpts.PromptsEnabled)
|
|
|
|
canLogout := promptUtil.Confirm(fmt.Sprintf("Are you sure you want to log out from '%s'?", context))
|
|
if canLogout {
|
|
if tlsTestResult, err := grpc_util.TestTLS(context, common.BearerTokenTimeout); err != nil {
|
|
log.Warnf("failed to check the TLS config settings for the server : %v.", err)
|
|
clientOpts.PlainText = true
|
|
} else {
|
|
if !tlsTestResult.TLS {
|
|
if !clientOpts.PlainText {
|
|
if !cli.AskToProceed("WARNING: server is not configured with TLS. Proceed (y/n)? ") {
|
|
os.Exit(1)
|
|
}
|
|
clientOpts.PlainText = true
|
|
}
|
|
} else if tlsTestResult.InsecureErr != nil {
|
|
if !clientOpts.Insecure {
|
|
if !cli.AskToProceed(fmt.Sprintf("WARNING: server certificate had error: %s. Proceed insecurely (y/n)? ", tlsTestResult.InsecureErr)) {
|
|
os.Exit(1)
|
|
}
|
|
clientOpts.Insecure = true
|
|
}
|
|
}
|
|
}
|
|
|
|
scheme := "https"
|
|
if clientOpts.PlainText {
|
|
scheme = "http"
|
|
}
|
|
if res, err := revokeServerToken(scheme, context, localCfg.GetToken(context), clientOpts.Insecure); err != nil {
|
|
log.Warnf("failed to invalidate token on server: %v.", err)
|
|
} else {
|
|
_ = res.Body.Close()
|
|
if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusSeeOther {
|
|
log.Warnf("server returned unexpected status code %d during logout", res.StatusCode)
|
|
} else {
|
|
log.Infof("token successfully invalidated on server")
|
|
}
|
|
}
|
|
|
|
// Remove token from local config
|
|
ok := localCfg.RemoveToken(context)
|
|
if !ok {
|
|
log.Fatalf("Context %s does not exist", context)
|
|
}
|
|
|
|
err = localconfig.ValidateLocalConfig(*localCfg)
|
|
if err != nil {
|
|
log.Fatalf("Error in logging out: %s", err)
|
|
}
|
|
err = localconfig.WriteLocalConfig(*localCfg, clientOpts.ConfigPath)
|
|
errutil.CheckError(err)
|
|
|
|
fmt.Printf("Logged out from '%s'\n", context)
|
|
} else {
|
|
log.Infof("Logout from '%s' cancelled", context)
|
|
}
|
|
},
|
|
}
|
|
return command
|
|
}
|
|
|
|
// revokeServerToken makes a call to the server logout endpoint to revoke the token server side
|
|
func revokeServerToken(scheme, hostName, token string, insecure bool) (res *http.Response, err error) {
|
|
if token == "" {
|
|
return nil, errors.New("error getting token from local context file")
|
|
}
|
|
logoutURL := fmt.Sprintf("%s://%s%s", scheme, hostName, common.LogoutEndpoint)
|
|
ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
|
|
defer cancel()
|
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, logoutURL, http.NoBody)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cookie := &http.Cookie{
|
|
Name: common.AuthCookieName,
|
|
Value: token,
|
|
}
|
|
req.AddCookie(cookie)
|
|
|
|
client := &http.Client{Timeout: common.TokenRevocationClientTimeout}
|
|
|
|
if insecure {
|
|
tr := http.DefaultTransport.(*http.Transport).Clone()
|
|
tr.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
|
|
client.Transport = tr
|
|
}
|
|
return client.Do(req)
|
|
}
|