mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
41536738c8
* 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]>
485 lines
11 KiB
Go
485 lines
11 KiB
Go
package sync
|
|
|
|
import (
|
|
"sort"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
corev1 "k8s.io/api/core/v1"
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/sync/common"
|
|
testingutils "github.com/hanzoai/deploy/gitops-engine/pkg/utils/testing"
|
|
)
|
|
|
|
func Test_syncTasks_kindOrder(t *testing.T) {
|
|
assert.Equal(t, -35, kindOrder["Namespace"])
|
|
assert.Equal(t, -1, kindOrder["APIService"])
|
|
assert.Equal(t, 0, kindOrder["MyCRD"])
|
|
}
|
|
|
|
func TestSortSyncTask(t *testing.T) {
|
|
sort.Sort(unsortedTasks)
|
|
assert.Equal(t, sortedTasks, unsortedTasks)
|
|
}
|
|
|
|
func TestAnySyncTasks(t *testing.T) {
|
|
res := unsortedTasks.Any(func(task *syncTask) bool {
|
|
return task.name() == "a"
|
|
})
|
|
assert.True(t, res)
|
|
|
|
res = unsortedTasks.Any(func(task *syncTask) bool {
|
|
return task.name() == "does-not-exist"
|
|
})
|
|
assert.False(t, res)
|
|
}
|
|
|
|
func TestAllSyncTasks(t *testing.T) {
|
|
res := unsortedTasks.All(func(task *syncTask) bool {
|
|
return task.name() != ""
|
|
})
|
|
assert.False(t, res)
|
|
|
|
res = unsortedTasks.All(func(task *syncTask) bool {
|
|
return task.name() == "a"
|
|
})
|
|
assert.False(t, res)
|
|
}
|
|
|
|
func TestSplitSyncTasks(t *testing.T) {
|
|
named, unnamed := sortedTasks.Split(func(task *syncTask) bool {
|
|
return task.name() != ""
|
|
})
|
|
assert.Equal(t, named, namedObjTasks)
|
|
assert.Equal(t, unnamed, unnamedTasks)
|
|
}
|
|
|
|
var unsortedTasks = syncTasks{
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "Pod",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "Service",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "PersistentVolume",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
phase: common.SyncPhaseSyncFail, targetObj: &unstructured.Unstructured{},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"annotations": map[string]any{
|
|
"argocd.argoproj.io/sync-wave": "1",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"name": "b",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"name": "a",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"annotations": map[string]any{
|
|
"argocd.argoproj.io/sync-wave": "-1",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
phase: common.SyncPhasePreSync,
|
|
targetObj: &unstructured.Unstructured{},
|
|
},
|
|
{
|
|
phase: common.SyncPhasePostSync, targetObj: &unstructured.Unstructured{},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "ConfigMap",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
var sortedTasks = syncTasks{
|
|
{
|
|
phase: common.SyncPhasePreSync,
|
|
targetObj: &unstructured.Unstructured{},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"annotations": map[string]any{
|
|
"argocd.argoproj.io/sync-wave": "-1",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "ConfigMap",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "PersistentVolume",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "Service",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "Pod",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"name": "a",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"name": "b",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"annotations": map[string]any{
|
|
"argocd.argoproj.io/sync-wave": "1",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
phase: common.SyncPhasePostSync,
|
|
targetObj: &unstructured.Unstructured{},
|
|
},
|
|
{
|
|
phase: common.SyncPhaseSyncFail,
|
|
targetObj: &unstructured.Unstructured{},
|
|
},
|
|
}
|
|
|
|
var namedObjTasks = syncTasks{
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"name": "a",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"name": "b",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
var unnamedTasks = syncTasks{
|
|
{
|
|
phase: common.SyncPhasePreSync,
|
|
targetObj: &unstructured.Unstructured{},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"annotations": map[string]any{
|
|
"argocd.argoproj.io/sync-wave": "-1",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "ConfigMap",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "PersistentVolume",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "Service",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
"kind": "Pod",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"GroupVersion": corev1.SchemeGroupVersion.String(),
|
|
},
|
|
},
|
|
},
|
|
{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"annotations": map[string]any{
|
|
"argocd.argoproj.io/sync-wave": "1",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
phase: common.SyncPhasePostSync,
|
|
targetObj: &unstructured.Unstructured{},
|
|
},
|
|
{
|
|
phase: common.SyncPhaseSyncFail,
|
|
targetObj: &unstructured.Unstructured{},
|
|
},
|
|
}
|
|
|
|
func Test_syncTasks_Filter(t *testing.T) {
|
|
tasks := syncTasks{{phase: common.SyncPhaseSync}, {phase: common.SyncPhasePostSync}}
|
|
|
|
assert.Equal(t, syncTasks{{phase: common.SyncPhaseSync}}, tasks.Filter(func(t *syncTask) bool {
|
|
return t.phase == common.SyncPhaseSync
|
|
}))
|
|
}
|
|
|
|
func TestSyncNamespaceAgainstCRD(t *testing.T) {
|
|
crd := &syncTask{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"kind": "Workflow",
|
|
},
|
|
},
|
|
}
|
|
namespace := &syncTask{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"kind": "Namespace",
|
|
},
|
|
},
|
|
}
|
|
|
|
unsorted := syncTasks{crd, namespace}
|
|
sort.Sort(unsorted)
|
|
|
|
assert.Equal(t, syncTasks{namespace, crd}, unsorted)
|
|
}
|
|
|
|
func TestSyncTasksSort_NamespaceAndObjectInNamespace(t *testing.T) {
|
|
hook1 := &syncTask{
|
|
phase: common.SyncPhasePreSync,
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"kind": "Job",
|
|
"metadata": map[string]any{
|
|
"namespace": "myNamespace1",
|
|
"name": "mySyncHookJob1",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
hook2 := &syncTask{
|
|
phase: common.SyncPhasePreSync,
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"kind": "Job",
|
|
"metadata": map[string]any{
|
|
"namespace": "myNamespace2",
|
|
"name": "mySyncHookJob2",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
namespace1 := &syncTask{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"kind": "Namespace",
|
|
"metadata": map[string]any{
|
|
"name": "myNamespace1",
|
|
"annotations": map[string]string{
|
|
"argocd.argoproj.io/sync-wave": "1",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
namespace2 := &syncTask{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"kind": "Namespace",
|
|
"metadata": map[string]any{
|
|
"name": "myNamespace2",
|
|
"annotations": map[string]string{
|
|
"argocd.argoproj.io/sync-wave": "2",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
unsorted := syncTasks{hook1, hook2, namespace1, namespace2}
|
|
unsorted.Sort()
|
|
|
|
assert.Equal(t, syncTasks{namespace1, hook1, namespace2, hook2}, unsorted)
|
|
assert.Equal(t, 0, namespace1.wave())
|
|
assert.Equal(t, common.SyncPhase(common.SyncPhasePreSync), namespace1.phase)
|
|
assert.Equal(t, 0, namespace2.wave())
|
|
assert.Equal(t, common.SyncPhase(common.SyncPhasePreSync), namespace2.phase)
|
|
}
|
|
|
|
func TestSyncTasksSort_CRDAndCR(t *testing.T) {
|
|
cr := &syncTask{
|
|
phase: common.SyncPhasePreSync,
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"kind": "Workflow",
|
|
"apiVersion": "argoproj.io/v1",
|
|
},
|
|
},
|
|
}
|
|
crd := &syncTask{
|
|
targetObj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"apiVersion": "apiextensions.k8s.io/v1",
|
|
"kind": "CustomResourceDefinition",
|
|
"spec": map[string]any{
|
|
"group": "argoproj.io",
|
|
"names": map[string]any{
|
|
"kind": "Workflow",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
unsorted := syncTasks{cr, crd}
|
|
unsorted.Sort()
|
|
|
|
assert.Equal(t, syncTasks{crd, cr}, unsorted)
|
|
}
|
|
|
|
func Test_syncTasks_multiStep(t *testing.T) {
|
|
t.Run("Single", func(t *testing.T) {
|
|
tasks := syncTasks{{liveObj: testingutils.Annotate(testingutils.NewPod(), common.AnnotationSyncWave, "-1"), phase: common.SyncPhaseSync}}
|
|
assert.Equal(t, common.SyncPhaseSync, string(tasks.phase()))
|
|
assert.Equal(t, -1, tasks.wave())
|
|
assert.Equal(t, common.SyncPhaseSync, string(tasks.lastPhase()))
|
|
assert.Equal(t, -1, tasks.lastWave())
|
|
assert.False(t, tasks.multiStep())
|
|
})
|
|
t.Run("Double", func(t *testing.T) {
|
|
tasks := syncTasks{
|
|
{liveObj: testingutils.Annotate(testingutils.NewPod(), common.AnnotationSyncWave, "-1"), phase: common.SyncPhasePreSync},
|
|
{liveObj: testingutils.Annotate(testingutils.NewPod(), common.AnnotationSyncWave, "1"), phase: common.SyncPhasePostSync},
|
|
}
|
|
assert.Equal(t, common.SyncPhasePreSync, string(tasks.phase()))
|
|
assert.Equal(t, -1, tasks.wave())
|
|
assert.Equal(t, common.SyncPhasePostSync, string(tasks.lastPhase()))
|
|
assert.Equal(t, 1, tasks.lastWave())
|
|
assert.True(t, tasks.multiStep())
|
|
})
|
|
}
|