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]>
123 lines
5.3 KiB
Go
123 lines
5.3 KiB
Go
package e2e
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
. "github.com/hanzoai/deploy/gitops-engine/pkg/sync/common"
|
|
|
|
applicationpkg "github.com/hanzoai/deploy/pkg/apiclient/application"
|
|
. "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
. "github.com/hanzoai/deploy/test/e2e/fixture"
|
|
. "github.com/hanzoai/deploy/test/e2e/fixture/app"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
)
|
|
|
|
const wardleAPIServiceName = "v1alpha1.wardle.example.com"
|
|
|
|
// TestAPIServiceLateRegistrationIsDiscovered verifies that when an aggregated
|
|
// (extension) API server is registered AFTER Argo CD is already running, the
|
|
// destination cluster cache picks up the newly served group/kind WITHOUT a manual
|
|
// cache invalidation or hard refresh.
|
|
//
|
|
// The scenario reproduces the original bug: starting Argo CD without the
|
|
// aggregated apiserver running means its group/kind is absent from discovery, so
|
|
// the cluster cache never watches it. Argo CD watches APIService objects and, on
|
|
// the fix, reacts to an APIService becoming Available by re-running discovery and
|
|
// starting the missing watches - mirroring the existing CRD handling.
|
|
//
|
|
// The assertion deliberately checks the application RESOURCE TREE (which is built
|
|
// purely from resources the cluster cache is watching) rather than the resource
|
|
// sync status. The sync status is not a reliable signal here because
|
|
// GetManagedLiveObjs falls back to a direct live API GET for kinds that are not
|
|
// watched, so a resource can show as Synced even though the cache never observed
|
|
// it - which is exactly why it would be missing from the UI/tree.
|
|
func TestAPIServiceLateRegistrationIsDiscovered(t *testing.T) {
|
|
// The aggregated apiserver infrastructure is cluster-scoped (Namespace,
|
|
// APIService, ClusterRole(Binding)s) and is not managed by an Argo CD app. It
|
|
// is labeled with e2e.argoproj.io=true so fixture.EnsureCleanState tears it
|
|
// down between tests; a dangling APIService backed by a deleted service would
|
|
// otherwise degrade discovery for subsequent tests.
|
|
const serverManifests = "testdata/aggregated-apiserver-server/manifests.yaml"
|
|
|
|
flunderManifest := `apiVersion: wardle.example.com/v1alpha1
|
|
kind: Flunder
|
|
metadata:
|
|
name: e2e-flunder
|
|
`
|
|
|
|
ctx := Given(t)
|
|
ctx.
|
|
Path("aggregated-apiserver").
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
// Baseline: the app - and therefore the destination cluster cache - is
|
|
// synced and running before the aggregated API exists.
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(ResourceSyncStatusIs("ConfigMap", "aggregated-apiserver-canary", SyncStatusCodeSynced)).
|
|
When().
|
|
And(func() {
|
|
// Register the extension apiserver AFTER Argo CD is up and wait until it
|
|
// is actually serving its API group.
|
|
errors.NewHandler(t).FailOnErr(Run("", "kubectl", "apply", "-f", serverManifests))
|
|
errors.NewHandler(t).FailOnErr(Run("", "kubectl", "-n", "wardle", "rollout", "status", "deployment/wardle-server", "--timeout=180s"))
|
|
errors.NewHandler(t).FailOnErr(Run("", "kubectl", "wait", "--for=condition=Available", "apiservice/"+wardleAPIServiceName, "--timeout=180s"))
|
|
}).
|
|
// Deliberately NO InvalidateCache and NO RefreshTypeHard here - the cache must
|
|
// discover the new kind on its own in response to the APIService event.
|
|
AddFile("flunder.yaml", flunderManifest).
|
|
Refresh(RefreshTypeNormal).
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(app *Application) {
|
|
// The Flunder appears in the resource tree only if the cluster cache
|
|
// discovered the aggregated kind and is watching it. This is the behavior
|
|
// under test: without reacting to the APIService event, the cache never
|
|
// watches wardle.example.com and the Flunder is absent from the tree (and
|
|
// the UI) until a manual invalidation.
|
|
closer, cdClient := ArgoCDClientset.NewApplicationClientOrDie()
|
|
defer utilio.Close(closer)
|
|
|
|
require.Eventually(t, func() bool {
|
|
// Trigger a normal (soft) refresh so the controller recomputes the
|
|
// resource tree from the live cluster cache. This does NOT invalidate
|
|
// the cache or re-run discovery: without the APIService fix the kind
|
|
// remains unwatched, so the Flunder never enters the tree regardless of
|
|
// how many times we refresh.
|
|
refresh := string(RefreshTypeNormal)
|
|
if _, err := cdClient.Get(context.Background(), &applicationpkg.ApplicationQuery{
|
|
Name: &app.Name,
|
|
AppNamespace: &app.Namespace,
|
|
Project: []string{app.Spec.Project},
|
|
Refresh: &refresh,
|
|
}); err != nil {
|
|
t.Logf("app refresh failed: %v", err)
|
|
}
|
|
tree, err := cdClient.ResourceTree(context.Background(), &applicationpkg.ResourcesQuery{
|
|
ApplicationName: &app.Name,
|
|
AppNamespace: &app.Namespace,
|
|
Project: &app.Spec.Project,
|
|
})
|
|
if err != nil {
|
|
t.Logf("failed to get resource tree: %v", err)
|
|
return false
|
|
}
|
|
for _, node := range tree.Nodes {
|
|
if node.Group == "wardle.example.com" && node.Kind == "Flunder" && node.Name == "e2e-flunder" {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}, 90*time.Second, 3*time.Second, "Flunder should appear in the application resource tree without a cache invalidation")
|
|
})
|
|
}
|