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]>
250 lines
7.8 KiB
Go
250 lines
7.8 KiB
Go
package commands
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"runtime/debug"
|
|
"syscall"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/spf13/cobra"
|
|
"k8s.io/client-go/kubernetes"
|
|
"k8s.io/client-go/tools/clientcmd"
|
|
"sigs.k8s.io/yaml"
|
|
|
|
cmdutil "github.com/hanzoai/deploy/cmd/util"
|
|
"github.com/hanzoai/deploy/util/cli"
|
|
"github.com/hanzoai/deploy/util/dex"
|
|
"github.com/hanzoai/deploy/util/env"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
"github.com/hanzoai/deploy/util/settings"
|
|
"github.com/hanzoai/deploy/util/tls"
|
|
)
|
|
|
|
func NewCommand() *cobra.Command {
|
|
command := &cobra.Command{
|
|
Use: common.CommandDex,
|
|
Short: "argocd-dex tools used by Argo CD",
|
|
Long: "argocd-dex has internal utility tools used by Argo CD",
|
|
DisableAutoGenTag: true,
|
|
Run: func(c *cobra.Command, args []string) {
|
|
c.HelpFunc()(c, args)
|
|
},
|
|
}
|
|
|
|
command.AddCommand(NewRunDexCommand())
|
|
command.AddCommand(NewGenDexConfigCommand())
|
|
return command
|
|
}
|
|
|
|
func NewRunDexCommand() *cobra.Command {
|
|
var (
|
|
clientConfig clientcmd.ClientConfig
|
|
disableTLS bool
|
|
)
|
|
command := cobra.Command{
|
|
Use: "rundex",
|
|
Short: "Runs dex generating a config using settings from the Argo CD configmap and secret",
|
|
RunE: func(c *cobra.Command, _ []string) error {
|
|
ctx := c.Context()
|
|
|
|
vers := common.GetVersion()
|
|
namespace, _, err := clientConfig.Namespace()
|
|
errors.CheckError(err)
|
|
vers.LogStartupInfo(
|
|
"ArgoCD Dex Server",
|
|
map[string]any{
|
|
"namespace": namespace,
|
|
},
|
|
)
|
|
|
|
cli.SetLogFormat(cmdutil.LogFormat)
|
|
cli.SetLogLevel(cmdutil.LogLevel)
|
|
|
|
// Recover from panic and log the error using the configured logger instead of the default.
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
log.WithField("trace", string(debug.Stack())).Fatal("Recovered from panic: ", r)
|
|
}
|
|
}()
|
|
|
|
_, err = exec.LookPath("dex")
|
|
errors.CheckError(err)
|
|
config, err := clientConfig.ClientConfig()
|
|
errors.CheckError(err)
|
|
config.UserAgent = fmt.Sprintf("argocd-dex/%s (%s)", vers.Version, vers.Platform)
|
|
kubeClientset := kubernetes.NewForConfigOrDie(config)
|
|
|
|
if !disableTLS {
|
|
config, err := tls.CreateServerTLSConfig("/tls/tls.crt", "/tls/tls.key", []string{"localhost", "dexserver"}, "")
|
|
if err != nil {
|
|
log.Fatalf("could not create TLS config: %v", err)
|
|
}
|
|
certPem, keyPem := tls.EncodeX509KeyPair(config.Certificates[0])
|
|
err = os.WriteFile("/tmp/tls.crt", certPem, 0o600)
|
|
if err != nil {
|
|
log.Fatalf("could not write TLS certificate: %v", err)
|
|
}
|
|
err = os.WriteFile("/tmp/tls.key", keyPem, 0o600)
|
|
if err != nil {
|
|
log.Fatalf("could not write TLS key: %v", err)
|
|
}
|
|
}
|
|
|
|
settingsMgr := settings.NewSettingsManager(ctx, kubeClientset, namespace)
|
|
prevSettings, err := settingsMgr.GetSettings()
|
|
errors.CheckError(err)
|
|
updateCh := make(chan *settings.ArgoCDSettings, 1)
|
|
settingsMgr.Subscribe(updateCh)
|
|
|
|
for {
|
|
var cmd *exec.Cmd
|
|
dexCfgBytes, err := dex.GenerateDexConfigYAML(prevSettings, disableTLS)
|
|
errors.CheckError(err)
|
|
if len(dexCfgBytes) == 0 {
|
|
log.Infof("dex is not configured")
|
|
} else {
|
|
err = os.WriteFile("/tmp/dex.yaml", dexCfgBytes, 0o644)
|
|
errors.CheckError(err)
|
|
log.Debug(redactor(string(dexCfgBytes)))
|
|
cmd = exec.CommandContext(ctx, "dex", "serve", "/tmp/dex.yaml")
|
|
cmd.Stdout = os.Stdout
|
|
cmd.Stderr = os.Stderr
|
|
err = cmd.Start()
|
|
errors.CheckError(err)
|
|
}
|
|
|
|
// loop until the dex config changes
|
|
for {
|
|
newSettings := <-updateCh
|
|
newDexCfgBytes, err := dex.GenerateDexConfigYAML(newSettings, disableTLS)
|
|
errors.CheckError(err)
|
|
if !bytes.Equal(newDexCfgBytes, dexCfgBytes) {
|
|
prevSettings = newSettings
|
|
log.Infof("dex config modified. restarting dex")
|
|
if cmd != nil && cmd.Process != nil {
|
|
err = cmd.Process.Signal(syscall.SIGTERM)
|
|
errors.CheckError(err)
|
|
_, err = cmd.Process.Wait()
|
|
errors.CheckError(err)
|
|
}
|
|
break
|
|
}
|
|
log.Infof("dex config unmodified")
|
|
}
|
|
}
|
|
},
|
|
}
|
|
|
|
clientConfig = cli.AddKubectlFlagsToCmd(&command)
|
|
command.Flags().StringVar(&cmdutil.LogFormat, "logformat", env.StringFromEnv("ARGOCD_DEX_SERVER_LOGFORMAT", "json"), "Set the logging format. One of: json|text")
|
|
command.Flags().StringVar(&cmdutil.LogLevel, "loglevel", env.StringFromEnv("ARGOCD_DEX_SERVER_LOGLEVEL", "info"), "Set the logging level. One of: debug|info|warn|error")
|
|
command.Flags().BoolVar(&disableTLS, "disable-tls", env.ParseBoolFromEnv("ARGOCD_DEX_SERVER_DISABLE_TLS", false), "Disable TLS on the HTTP endpoint")
|
|
return &command
|
|
}
|
|
|
|
func NewGenDexConfigCommand() *cobra.Command {
|
|
var (
|
|
clientConfig clientcmd.ClientConfig
|
|
out string
|
|
disableTLS bool
|
|
)
|
|
command := cobra.Command{
|
|
Use: "gendexcfg",
|
|
Short: "Generates a dex config from Argo CD settings",
|
|
RunE: func(c *cobra.Command, _ []string) error {
|
|
ctx := c.Context()
|
|
|
|
cli.SetLogFormat(cmdutil.LogFormat)
|
|
cli.SetLogLevel(cmdutil.LogLevel)
|
|
|
|
config, err := clientConfig.ClientConfig()
|
|
errors.CheckError(err)
|
|
namespace, _, err := clientConfig.Namespace()
|
|
errors.CheckError(err)
|
|
kubeClientset := kubernetes.NewForConfigOrDie(config)
|
|
settingsMgr := settings.NewSettingsManager(ctx, kubeClientset, namespace)
|
|
settings, err := settingsMgr.GetSettings()
|
|
errors.CheckError(err)
|
|
dexCfgBytes, err := dex.GenerateDexConfigYAML(settings, disableTLS)
|
|
errors.CheckError(err)
|
|
if len(dexCfgBytes) == 0 {
|
|
log.Infof("dex is not configured")
|
|
return nil
|
|
}
|
|
if out == "" {
|
|
dexCfg := make(map[string]any)
|
|
err := yaml.Unmarshal(dexCfgBytes, &dexCfg)
|
|
errors.CheckError(err)
|
|
if staticClientsInterface, ok := dexCfg["staticClients"]; ok {
|
|
if staticClients, ok := staticClientsInterface.([]any); ok {
|
|
for i := range staticClients {
|
|
staticClient := staticClients[i]
|
|
if mappings, ok := staticClient.(map[string]any); ok {
|
|
for key := range mappings {
|
|
if key == "secret" {
|
|
mappings[key] = "******"
|
|
}
|
|
}
|
|
staticClients[i] = mappings
|
|
}
|
|
}
|
|
dexCfg["staticClients"] = staticClients
|
|
}
|
|
}
|
|
errors.CheckError(err)
|
|
maskedDexCfgBytes, err := yaml.Marshal(dexCfg)
|
|
errors.CheckError(err)
|
|
fmt.Print(string(maskedDexCfgBytes))
|
|
} else {
|
|
err = os.WriteFile(out, dexCfgBytes, 0o644)
|
|
errors.CheckError(err)
|
|
}
|
|
return nil
|
|
},
|
|
}
|
|
|
|
clientConfig = cli.AddKubectlFlagsToCmd(&command)
|
|
command.Flags().StringVar(&cmdutil.LogFormat, "logformat", env.StringFromEnv("ARGOCD_DEX_SERVER_LOGFORMAT", "json"), "Set the logging format. One of: json|text")
|
|
command.Flags().StringVar(&cmdutil.LogLevel, "loglevel", env.StringFromEnv("ARGOCD_DEX_SERVER_LOGLEVEL", "info"), "Set the logging level. One of: debug|info|warn|error")
|
|
command.Flags().StringVarP(&out, "out", "o", "", "Output to the specified file instead of stdout")
|
|
command.Flags().BoolVar(&disableTLS, "disable-tls", env.ParseBoolFromEnv("ARGOCD_DEX_SERVER_DISABLE_TLS", false), "Disable TLS on the HTTP endpoint")
|
|
return &command
|
|
}
|
|
|
|
func iterateStringFields(obj any, callback func(name string, val string) string) {
|
|
switch obj := obj.(type) {
|
|
case map[string]any:
|
|
for field, val := range obj {
|
|
if strVal, ok := val.(string); ok {
|
|
obj[field] = callback(field, strVal)
|
|
} else {
|
|
iterateStringFields(val, callback)
|
|
}
|
|
}
|
|
case []any:
|
|
for i := range obj {
|
|
iterateStringFields(obj[i], callback)
|
|
}
|
|
}
|
|
}
|
|
|
|
func redactor(dirtyString string) string {
|
|
config := make(map[string]any)
|
|
err := yaml.Unmarshal([]byte(dirtyString), &config)
|
|
errors.CheckError(err)
|
|
iterateStringFields(config, func(name string, val string) string {
|
|
if name == "clientSecret" || name == "secret" || name == "bindPW" {
|
|
return "********"
|
|
}
|
|
return val
|
|
})
|
|
data, err := yaml.Marshal(config)
|
|
errors.CheckError(err)
|
|
return string(data)
|
|
}
|