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]>
375 lines
12 KiB
Go
375 lines
12 KiB
Go
package headless
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/alicebob/miniredis/v2"
|
|
"github.com/golang/protobuf/ptypes/empty"
|
|
"github.com/redis/go-redis/v9"
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/spf13/cobra"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
runtimeUtil "k8s.io/apimachinery/pkg/util/runtime"
|
|
"k8s.io/client-go/dynamic"
|
|
"k8s.io/client-go/kubernetes"
|
|
cache2 "k8s.io/client-go/tools/cache"
|
|
"k8s.io/client-go/tools/clientcmd"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
"github.com/hanzoai/deploy/util/tls"
|
|
|
|
"github.com/hanzoai/deploy/cmd/argocd/commands/initialize"
|
|
"github.com/hanzoai/deploy/common"
|
|
"github.com/hanzoai/deploy/pkg/apiclient"
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
appclientset "github.com/hanzoai/deploy/pkg/client/clientset/versioned"
|
|
repoapiclient "github.com/hanzoai/deploy/reposerver/apiclient"
|
|
"github.com/hanzoai/deploy/server"
|
|
servercache "github.com/hanzoai/deploy/server/cache"
|
|
"github.com/hanzoai/deploy/util/cache"
|
|
appstatecache "github.com/hanzoai/deploy/util/cache/appstate"
|
|
"github.com/hanzoai/deploy/util/cli"
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
kubeutil "github.com/hanzoai/deploy/util/kube"
|
|
"github.com/hanzoai/deploy/util/localconfig"
|
|
)
|
|
|
|
type forwardCacheClient struct {
|
|
namespace string
|
|
context string
|
|
init sync.Once
|
|
client cache.CacheClient
|
|
compression cache.RedisCompressionType
|
|
err error
|
|
redisHaProxyName string
|
|
redisName string
|
|
redisPassword string
|
|
}
|
|
|
|
func (c *forwardCacheClient) doLazy(action func(client cache.CacheClient) error) error {
|
|
c.init.Do(func() {
|
|
overrides := clientcmd.ConfigOverrides{
|
|
CurrentContext: c.context,
|
|
}
|
|
redisHaProxyPodLabelSelector := common.LabelKeyAppName + "=" + c.redisHaProxyName
|
|
redisPodLabelSelector := common.LabelKeyAppName + "=" + c.redisName
|
|
redisPort, err := kubeutil.PortForward(6379, c.namespace, &overrides,
|
|
redisHaProxyPodLabelSelector, redisPodLabelSelector)
|
|
if err != nil {
|
|
c.err = err
|
|
return
|
|
}
|
|
|
|
redisClient := redis.NewClient(&redis.Options{Addr: fmt.Sprintf("localhost:%d", redisPort), Password: c.redisPassword})
|
|
c.client = cache.NewRedisCache(redisClient, time.Hour, c.compression)
|
|
})
|
|
if c.err != nil {
|
|
return c.err
|
|
}
|
|
return action(c.client)
|
|
}
|
|
|
|
func (c *forwardCacheClient) Set(item *cache.Item) error {
|
|
return c.doLazy(func(client cache.CacheClient) error {
|
|
return client.Set(item)
|
|
})
|
|
}
|
|
|
|
func (c *forwardCacheClient) Rename(oldKey string, newKey string, expiration time.Duration) error {
|
|
return c.doLazy(func(client cache.CacheClient) error {
|
|
return client.Rename(oldKey, newKey, expiration)
|
|
})
|
|
}
|
|
|
|
func (c *forwardCacheClient) Get(key string, obj any) error {
|
|
return c.doLazy(func(client cache.CacheClient) error {
|
|
return client.Get(key, obj)
|
|
})
|
|
}
|
|
|
|
func (c *forwardCacheClient) Delete(key string) error {
|
|
return c.doLazy(func(client cache.CacheClient) error {
|
|
return client.Delete(key)
|
|
})
|
|
}
|
|
|
|
func (c *forwardCacheClient) OnUpdated(ctx context.Context, key string, callback func() error) error {
|
|
return c.doLazy(func(client cache.CacheClient) error {
|
|
return client.OnUpdated(ctx, key, callback)
|
|
})
|
|
}
|
|
|
|
func (c *forwardCacheClient) NotifyUpdated(key string) error {
|
|
return c.doLazy(func(client cache.CacheClient) error {
|
|
return client.NotifyUpdated(key)
|
|
})
|
|
}
|
|
|
|
type forwardRepoClientset struct {
|
|
namespace string
|
|
context string
|
|
init sync.Once
|
|
repoClientset repoapiclient.Clientset
|
|
err error
|
|
repoServerName string
|
|
kubeClientset kubernetes.Interface
|
|
}
|
|
|
|
func (c *forwardRepoClientset) NewRepoServerClient() (utilio.Closer, repoapiclient.RepoServerServiceClient, error) {
|
|
c.init.Do(func() {
|
|
overrides := clientcmd.ConfigOverrides{
|
|
CurrentContext: c.context,
|
|
}
|
|
repoServerName := c.repoServerName
|
|
repoServererviceLabelSelector := common.LabelKeyComponentRepoServer + "=" + common.LabelValueComponentRepoServer
|
|
repoServerServices, err := c.kubeClientset.CoreV1().Services(c.namespace).List(context.Background(), metav1.ListOptions{LabelSelector: repoServererviceLabelSelector})
|
|
if err != nil {
|
|
c.err = err
|
|
return
|
|
}
|
|
if len(repoServerServices.Items) > 0 {
|
|
if repoServerServicelabel, ok := repoServerServices.Items[0].Labels[common.LabelKeyAppName]; ok && repoServerServicelabel != "" {
|
|
repoServerName = repoServerServicelabel
|
|
}
|
|
}
|
|
repoServerPodLabelSelector := common.LabelKeyAppName + "=" + repoServerName
|
|
repoServerPort, err := kubeutil.PortForward(8081, c.namespace, &overrides, repoServerPodLabelSelector)
|
|
if err != nil {
|
|
c.err = err
|
|
return
|
|
}
|
|
c.repoClientset = repoapiclient.NewRepoServerClientset(fmt.Sprintf("localhost:%d", repoServerPort), 60, tls.Configuration{
|
|
DisableTLS: false, StrictValidation: false,
|
|
})
|
|
})
|
|
if c.err != nil {
|
|
return nil, nil, c.err
|
|
}
|
|
return c.repoClientset.NewRepoServerClient()
|
|
}
|
|
|
|
func testAPI(ctx context.Context, clientOpts *apiclient.ClientOptions) error {
|
|
apiClient, err := apiclient.NewClient(clientOpts)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create API client: %w", err)
|
|
}
|
|
closer, versionClient, err := apiClient.NewVersionClient()
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create version client: %w", err)
|
|
}
|
|
defer utilio.Close(closer)
|
|
_, err = versionClient.Version(ctx, &empty.Empty{})
|
|
if err != nil {
|
|
return fmt.Errorf("failed to get version: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// MaybeStartLocalServer allows executing command in a headless mode. If we're in core mode, starts the Argo CD API
|
|
// server on the fly and changes provided client options to use started API server port.
|
|
//
|
|
// If the clientOpts enables core mode, but the local config does not have core mode enabled, this function will
|
|
// not start the local server.
|
|
func MaybeStartLocalServer(ctx context.Context, clientOpts *apiclient.ClientOptions, ctxStr string, port *int, address *string, clientConfig clientcmd.ClientConfig) (func(), error) {
|
|
if clientConfig == nil {
|
|
clientConfig = newClientConfig(clientOpts.KubeOverrides)
|
|
}
|
|
startInProcessAPI := clientOpts.Core
|
|
if !startInProcessAPI {
|
|
// Core mode is enabled on client options. Check the local config to see if we should start the API server.
|
|
localCfg, err := localconfig.ReadLocalConfig(clientOpts.ConfigPath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error reading local config: %w", err)
|
|
}
|
|
if localCfg != nil {
|
|
configCtx, err := localCfg.ResolveContext(clientOpts.Context)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error resolving context: %w", err)
|
|
}
|
|
// There was a local config file, so determine whether core mode is enabled per the config file.
|
|
startInProcessAPI = configCtx.Server.Core
|
|
}
|
|
}
|
|
// If we're in core mode, start the API server on the fly.
|
|
if !startInProcessAPI {
|
|
return nil, nil
|
|
}
|
|
|
|
// get rid of logging error handler
|
|
runtimeUtil.ErrorHandlers = runtimeUtil.ErrorHandlers[1:]
|
|
cli.SetLogLevel(log.ErrorLevel.String())
|
|
log.SetLevel(log.ErrorLevel)
|
|
os.Setenv(v1alpha1.EnvVarFakeInClusterConfig, "true")
|
|
if address == nil {
|
|
address = new("localhost")
|
|
}
|
|
if port == nil || *port == 0 {
|
|
addr := *address + ":0"
|
|
lc := &net.ListenConfig{}
|
|
ln, err := lc.Listen(ctx, "tcp", addr)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to listen on %q: %w", addr, err)
|
|
}
|
|
port = &ln.Addr().(*net.TCPAddr).Port
|
|
utilio.Close(ln)
|
|
}
|
|
|
|
restConfig, err := clientConfig.ClientConfig()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error creating client config: %w", err)
|
|
}
|
|
appClientset, err := appclientset.NewForConfig(restConfig)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error creating app clientset: %w", err)
|
|
}
|
|
kubeClientset, err := kubernetes.NewForConfig(restConfig)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error creating kubernetes clientset: %w", err)
|
|
}
|
|
|
|
dynamicClientset, err := dynamic.NewForConfig(restConfig)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error creating kubernetes dynamic clientset: %w", err)
|
|
}
|
|
|
|
scheme := runtime.NewScheme()
|
|
err = v1alpha1.AddToScheme(scheme)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error adding argo resources to scheme: %w", err)
|
|
}
|
|
err = corev1.AddToScheme(scheme)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error adding corev1 resources to scheme: %w", err)
|
|
}
|
|
controllerClientset, err := client.New(restConfig, client.Options{
|
|
Scheme: scheme,
|
|
})
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error creating kubernetes controller clientset: %w", err)
|
|
}
|
|
controllerClientset = client.NewDryRunClient(controllerClientset)
|
|
|
|
namespace, _, err := clientConfig.Namespace()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error getting namespace: %w", err)
|
|
}
|
|
|
|
mr, err := miniredis.Run()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error running miniredis: %w", err)
|
|
}
|
|
redisOptions := &redis.Options{Addr: mr.Addr()}
|
|
if err = common.SetOptionalRedisPasswordFromKubeConfig(ctx, kubeClientset, namespace, redisOptions); err != nil {
|
|
log.Warnf("Failed to fetch & set redis password for namespace %s: %v", namespace, err)
|
|
}
|
|
|
|
appstateCache := appstatecache.NewCache(cache.NewCache(&forwardCacheClient{namespace: namespace, context: ctxStr, compression: cache.RedisCompressionType(clientOpts.RedisCompression), redisHaProxyName: clientOpts.RedisHaProxyName, redisName: clientOpts.RedisName, redisPassword: redisOptions.Password}), time.Hour)
|
|
srv := server.NewServer(ctx, server.ArgoCDServerOpts{
|
|
EnableGZip: false,
|
|
Namespace: namespace,
|
|
ListenPort: *port,
|
|
AppClientset: appClientset,
|
|
DisableAuth: true,
|
|
RedisClient: redis.NewClient(redisOptions),
|
|
Cache: servercache.NewCache(appstateCache, 0, 0),
|
|
KubeClientset: kubeClientset,
|
|
DynamicClientset: dynamicClientset,
|
|
KubeControllerClientset: controllerClientset,
|
|
Insecure: true,
|
|
ListenHost: *address,
|
|
RepoClientset: &forwardRepoClientset{namespace: namespace, context: ctxStr, repoServerName: clientOpts.RepoServerName, kubeClientset: kubeClientset},
|
|
EnableProxyExtension: false,
|
|
SyncWithReplaceAllowed: true,
|
|
}, server.ApplicationSetOpts{})
|
|
srv.Init(ctx)
|
|
|
|
lns, err := srv.Listen()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to listen: %w", err)
|
|
}
|
|
go srv.Run(ctx, lns)
|
|
clientOpts.ServerAddr = fmt.Sprintf("%s:%d", *address, *port)
|
|
clientOpts.PlainText = true
|
|
if !cache2.WaitForCacheSync(ctx.Done(), srv.Initialized) {
|
|
log.Fatal("Timed out waiting for project cache to sync")
|
|
}
|
|
|
|
tries := 5
|
|
for range tries {
|
|
err = testAPI(ctx, clientOpts)
|
|
if err == nil {
|
|
break
|
|
}
|
|
time.Sleep(time.Second)
|
|
}
|
|
if err != nil {
|
|
return nil, fmt.Errorf("all retries failed: %w", err)
|
|
}
|
|
return srv.Shutdown, nil
|
|
}
|
|
|
|
// NewClientOrDie creates a new API client from a set of config options, or fails fatally if the new client creation fails.
|
|
func NewClientOrDie(opts *apiclient.ClientOptions, c *cobra.Command) apiclient.Client {
|
|
ctx := c.Context()
|
|
|
|
ctxStr := resolveAndApplyKubeContext(opts, c)
|
|
// If we're in core mode, start the API server on the fly and configure the client `opts` to use it.
|
|
// If we're not in core mode, this function call will do nothing.
|
|
_, err := MaybeStartLocalServer(ctx, opts, ctxStr, nil, nil, nil)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
client, err := apiclient.NewClient(opts)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
return client
|
|
}
|
|
|
|
// newClientConfig creates a new clientcmd.ClientConfig based on the provided overrides.
|
|
func newClientConfig(overrides *clientcmd.ConfigOverrides) clientcmd.ClientConfig {
|
|
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
|
|
loadingRules.DefaultClientConfig = &clientcmd.DefaultClientConfig
|
|
|
|
configOverrides := clientcmd.ConfigOverrides{}
|
|
if overrides != nil {
|
|
configOverrides = *overrides
|
|
}
|
|
|
|
return clientcmd.NewInteractiveDeferredLoadingClientConfig(
|
|
loadingRules,
|
|
&configOverrides,
|
|
os.Stdin,
|
|
)
|
|
}
|
|
|
|
// resolveAndApplyKubeContext resolves the kube context name to use.
|
|
// If the context flag was explicitly set and opts is non-nil, it applies that
|
|
// value to opts.KubeOverrides.CurrentContext.
|
|
func resolveAndApplyKubeContext(opts *apiclient.ClientOptions, c *cobra.Command) string {
|
|
ctxStr := initialize.RetrieveContextIfChanged(c.Flag("context"))
|
|
if opts == nil {
|
|
return ctxStr
|
|
}
|
|
if ctxStr != "" {
|
|
if opts.KubeOverrides == nil {
|
|
opts.KubeOverrides = &clientcmd.ConfigOverrides{}
|
|
}
|
|
opts.KubeOverrides.CurrentContext = ctxStr
|
|
return ctxStr
|
|
}
|
|
|
|
if opts.KubeOverrides != nil {
|
|
return opts.KubeOverrides.CurrentContext
|
|
}
|
|
|
|
return ""
|
|
}
|