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]>
237 lines
7.3 KiB
Go
237 lines
7.3 KiB
Go
package utils
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
corev1 "k8s.io/api/core/v1"
|
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
k8scache "k8s.io/client-go/tools/cache"
|
|
ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
|
|
|
application "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
type fakeMultiNamespaceCache struct {
|
|
//nolint:unused
|
|
namespaceToCache map[string]ctrlcache.Cache
|
|
|
|
ctrlcache.Cache
|
|
k8scache.SharedIndexInformer
|
|
|
|
Store k8scache.Store
|
|
}
|
|
|
|
func (f *fakeMultiNamespaceCache) GetInformerForKind(_ context.Context, _ schema.GroupVersionKind, _ ...ctrlcache.InformerGetOption) (ctrlcache.Informer, error) {
|
|
return f, nil
|
|
}
|
|
|
|
func (f *fakeMultiNamespaceCache) GetStore() k8scache.Store {
|
|
return f.Store
|
|
}
|
|
|
|
type clientOptions struct {
|
|
objects []client.Object
|
|
getNSCache func(context.Context, client.Object) (ctrlcache.Cache, error)
|
|
storesByNs map[string]k8scache.Store
|
|
}
|
|
|
|
type clientOption func(*clientOptions)
|
|
|
|
func withObjects(objs ...client.Object) clientOption {
|
|
return func(o *clientOptions) { o.objects = objs }
|
|
}
|
|
|
|
func withGetNSCache(fn func(context.Context, client.Object) (ctrlcache.Cache, error)) clientOption {
|
|
return func(o *clientOptions) { o.getNSCache = fn }
|
|
}
|
|
|
|
func withStoresByNs(m map[string]k8scache.Store) clientOption {
|
|
return func(o *clientOptions) { o.storesByNs = m }
|
|
}
|
|
|
|
func newClient(t *testing.T, opts ...clientOption) (*cacheSyncingClient, k8scache.Store) {
|
|
t.Helper()
|
|
o := &clientOptions{}
|
|
for _, opt := range opts {
|
|
opt(o)
|
|
}
|
|
|
|
scheme := runtime.NewScheme()
|
|
require.NoError(t, application.AddToScheme(scheme))
|
|
|
|
store := k8scache.NewStore(func(obj any) (string, error) {
|
|
return obj.(client.Object).GetName(), nil
|
|
})
|
|
for _, obj := range o.objects {
|
|
require.NoError(t, store.Add(obj))
|
|
}
|
|
|
|
c := &cacheSyncingClient{
|
|
Client: fake.NewClientBuilder().WithScheme(scheme).WithObjects(o.objects...).Build(),
|
|
storesByNs: map[string]k8scache.Store{},
|
|
getNSCache: func(_ context.Context, _ client.Object) (ctrlcache.Cache, error) {
|
|
return &fakeMultiNamespaceCache{Store: store}, nil
|
|
},
|
|
}
|
|
if o.getNSCache != nil {
|
|
c.getNSCache = o.getNSCache
|
|
}
|
|
if o.storesByNs != nil {
|
|
c.storesByNs = o.storesByNs
|
|
}
|
|
return c, store
|
|
}
|
|
|
|
func TestCreateSyncsCache(t *testing.T) {
|
|
t.Parallel()
|
|
c, store := newClient(t)
|
|
|
|
app := &application.Application{
|
|
ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "argocd"},
|
|
}
|
|
require.NoError(t, c.Create(t.Context(), app))
|
|
|
|
require.Contains(t, store.List(), app)
|
|
}
|
|
|
|
func TestUpdateSyncsCache(t *testing.T) {
|
|
t.Parallel()
|
|
app := &application.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "test",
|
|
Namespace: "argocd",
|
|
Labels: map[string]string{"foo": "bar"},
|
|
},
|
|
}
|
|
c, store := newClient(t, withObjects(app))
|
|
|
|
updatedApp := app.DeepCopy()
|
|
updatedApp.Labels["foo"] = "bar-UPDATED"
|
|
require.NoError(t, c.Update(t.Context(), updatedApp))
|
|
|
|
updated, _, err := store.GetByKey("test")
|
|
require.NoError(t, err)
|
|
require.Equal(t, "bar-UPDATED", updated.(*application.Application).Labels["foo"])
|
|
}
|
|
|
|
func TestDeleteSyncsCache(t *testing.T) {
|
|
t.Parallel()
|
|
app := &application.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "test",
|
|
Namespace: "argocd",
|
|
Labels: map[string]string{"foo": "bar"},
|
|
},
|
|
}
|
|
c, store := newClient(t, withObjects(app))
|
|
|
|
require.NoError(t, c.Delete(t.Context(), app))
|
|
|
|
require.Empty(t, store.List())
|
|
}
|
|
|
|
// TestDeleteEvictsStaleCacheOnNotFound covers the "ApplicationSet stuck in Deleting" root cause.
|
|
// The informer store still holds an Application that has already been removed from the API server
|
|
// (a missed delete watch event). Deleting it returns NotFound. The stale entry must still be
|
|
// evicted from the store, otherwise cache-backed reads keep returning the ghost object forever and
|
|
// callers such as reverse deletion never converge, only a controller restart clears it.
|
|
func TestDeleteEvictsStaleCacheOnNotFound(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
// Seed the store with a ghost app, but leave the fake API client empty so Delete 404s.
|
|
app := &application.Application{
|
|
ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "argocd"},
|
|
}
|
|
c, store := newClient(t)
|
|
require.NoError(t, store.Add(app))
|
|
require.NotEmpty(t, store.List(), "precondition: store holds the stale entry")
|
|
|
|
require.NoError(t, c.Delete(t.Context(), app), "a NotFound delete must be swallowed, not surfaced")
|
|
|
|
require.Empty(t, store.List(), "stale cache entry should be evicted even though the API returned NotFound")
|
|
}
|
|
|
|
func TestNewClientDoesNotCrashWithMultiNamespaceCache(_ *testing.T) {
|
|
_ = NewCacheSyncingClient(nil, &fakeMultiNamespaceCache{})
|
|
}
|
|
|
|
func TestPatchNotFoundEvictsFromCache(t *testing.T) {
|
|
t.Parallel()
|
|
app := &application.Application{
|
|
ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "argocd"},
|
|
}
|
|
c, store := newClient(t, withObjects(app))
|
|
|
|
require.NoError(t, c.Client.Delete(t.Context(), app))
|
|
require.Contains(t, store.List(), app)
|
|
|
|
patchErr := c.Patch(t.Context(), app.DeepCopy(), client.MergeFrom(app))
|
|
require.Error(t, patchErr)
|
|
require.True(t, apierrors.IsNotFound(patchErr))
|
|
require.Empty(t, store.List())
|
|
}
|
|
|
|
func TestUpdateNotFoundEvictsFromCache(t *testing.T) {
|
|
t.Parallel()
|
|
app := &application.Application{
|
|
ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "argocd"},
|
|
}
|
|
c, store := newClient(t, withObjects(app))
|
|
|
|
require.NoError(t, c.Client.Delete(t.Context(), app))
|
|
require.Contains(t, store.List(), app)
|
|
|
|
updateErr := c.Update(t.Context(), app.DeepCopy())
|
|
require.Error(t, updateErr)
|
|
require.True(t, apierrors.IsNotFound(updateErr))
|
|
require.Empty(t, store.List())
|
|
}
|
|
|
|
func TestExecAndSyncCacheNotFoundSkipsNonApplication(t *testing.T) {
|
|
t.Parallel()
|
|
c, store := newClient(t)
|
|
notFound := apierrors.NewNotFound(schema.GroupResource{}, "x")
|
|
got := c.execAndSyncCache(t.Context(), func() error { return notFound }, &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "x", Namespace: "argocd"}}, false)
|
|
require.Error(t, got)
|
|
require.True(t, apierrors.IsNotFound(got))
|
|
require.Empty(t, store.List())
|
|
}
|
|
|
|
func TestExecAndSyncCacheNotFoundHandlesGetStoreError(t *testing.T) {
|
|
t.Parallel()
|
|
c, _ := newClient(t, withGetNSCache(func(_ context.Context, _ client.Object) (ctrlcache.Cache, error) {
|
|
return nil, errors.New("no cache")
|
|
}))
|
|
app := &application.Application{ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "argocd"}}
|
|
notFound := apierrors.NewNotFound(schema.GroupResource{}, "test")
|
|
require.NotPanics(t, func() {
|
|
_ = c.execAndSyncCache(t.Context(), func() error { return notFound }, app, false)
|
|
})
|
|
}
|
|
|
|
type errDeleteStore struct {
|
|
k8scache.Store
|
|
}
|
|
|
|
func (e *errDeleteStore) Delete(_ any) error {
|
|
return errors.New("delete failed")
|
|
}
|
|
|
|
func TestExecAndSyncCacheNotFoundHandlesDeleteError(t *testing.T) {
|
|
t.Parallel()
|
|
c, _ := newClient(t, withStoresByNs(map[string]k8scache.Store{"argocd": &errDeleteStore{}}))
|
|
app := &application.Application{ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "argocd"}}
|
|
notFound := apierrors.NewNotFound(schema.GroupResource{}, "test")
|
|
require.NotPanics(t, func() {
|
|
_ = c.execAndSyncCache(t.Context(), func() error { return notFound }, app, false)
|
|
})
|
|
}
|