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
10 KiB
Go
375 lines
10 KiB
Go
package commands
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/watch"
|
|
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
// TestAppSetDeleteWaitFlow verifies that when --wait is used and the appset has
|
|
// finalizers (still exists after Delete), the delete command watches for Deleted.
|
|
func TestAppSetDeleteWaitFlow(t *testing.T) {
|
|
appSetEventsCh := make(chan *v1alpha1.ApplicationSetWatchEvent, 1)
|
|
go func() {
|
|
defer close(appSetEventsCh)
|
|
appSetEventsCh <- &v1alpha1.ApplicationSetWatchEvent{
|
|
Type: watch.Added,
|
|
ApplicationSet: v1alpha1.ApplicationSet{ObjectMeta: metav1.ObjectMeta{Name: "test-appset"}},
|
|
}
|
|
appSetEventsCh <- &v1alpha1.ApplicationSetWatchEvent{Type: watch.Deleted}
|
|
}()
|
|
|
|
receivedDeleted := false
|
|
for appEvent := range appSetEventsCh {
|
|
if appEvent != nil && appEvent.Type == watch.Deleted {
|
|
receivedDeleted = true
|
|
break
|
|
}
|
|
}
|
|
assert.True(t, receivedDeleted, "wait loop should receive Deleted event from watch")
|
|
}
|
|
|
|
// TestAppSetCreateWaitFlow verifies that when --wait is used, the create command
|
|
// waits for ResourcesUpToDate from the watch before completing.
|
|
func TestAppSetCreateWaitFlow(t *testing.T) {
|
|
fakeClient := &fakeAcdClient{}
|
|
ctx := t.Context()
|
|
|
|
err := waitForApplicationSetResourcesUpToDate(ctx, fakeClient, "test-appset")
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
func TestAppSetCreateWaitDeletedError(t *testing.T) {
|
|
appSetEventsCh := make(chan *v1alpha1.ApplicationSetWatchEvent, 1)
|
|
go func() {
|
|
defer close(appSetEventsCh)
|
|
appSetEventsCh <- &v1alpha1.ApplicationSetWatchEvent{Type: watch.Deleted}
|
|
}()
|
|
|
|
var err error
|
|
for appEvent := range appSetEventsCh {
|
|
if appEvent == nil {
|
|
continue
|
|
}
|
|
if appEvent.Type == watch.Deleted {
|
|
err = errors.New("ApplicationSet was deleted before reaching ResourcesUpToDate")
|
|
break
|
|
}
|
|
}
|
|
require.Error(t, err)
|
|
assert.Contains(t, err.Error(), "deleted before reaching ResourcesUpToDate")
|
|
}
|
|
|
|
func TestIsApplicationSetResourcesUpToDate(t *testing.T) {
|
|
t.Run("returns true when ResourcesUpToDate is True", func(t *testing.T) {
|
|
appSet := &v1alpha1.ApplicationSet{
|
|
Status: v1alpha1.ApplicationSetStatus{
|
|
Conditions: []v1alpha1.ApplicationSetCondition{
|
|
{Type: v1alpha1.ApplicationSetConditionResourcesUpToDate, Status: v1alpha1.ApplicationSetConditionStatusTrue},
|
|
},
|
|
},
|
|
}
|
|
assert.True(t, isApplicationSetResourcesUpToDate(appSet))
|
|
})
|
|
|
|
t.Run("returns false when ResourcesUpToDate is False", func(t *testing.T) {
|
|
appSet := &v1alpha1.ApplicationSet{
|
|
Status: v1alpha1.ApplicationSetStatus{
|
|
Conditions: []v1alpha1.ApplicationSetCondition{
|
|
{Type: v1alpha1.ApplicationSetConditionResourcesUpToDate, Status: v1alpha1.ApplicationSetConditionStatusFalse},
|
|
},
|
|
},
|
|
}
|
|
assert.False(t, isApplicationSetResourcesUpToDate(appSet))
|
|
})
|
|
|
|
t.Run("returns false when no conditions", func(t *testing.T) {
|
|
appSet := &v1alpha1.ApplicationSet{}
|
|
assert.False(t, isApplicationSetResourcesUpToDate(appSet))
|
|
})
|
|
}
|
|
|
|
func TestPrintApplicationSetNames(t *testing.T) {
|
|
output, _ := captureOutput(func() error {
|
|
appSet := &v1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "test",
|
|
},
|
|
}
|
|
appSet2 := &v1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Namespace: "team-one",
|
|
Name: "test",
|
|
},
|
|
}
|
|
printApplicationSetNames([]v1alpha1.ApplicationSet{*appSet, *appSet2})
|
|
return nil
|
|
})
|
|
expectation := "test\nteam-one/test\n"
|
|
require.Equalf(t, output, expectation, "Incorrect print params output %q, should be %q", output, expectation)
|
|
}
|
|
|
|
func TestPrintApplicationSetTable(t *testing.T) {
|
|
output, err := captureOutput(func() error {
|
|
app := &v1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "app-name",
|
|
},
|
|
Spec: v1alpha1.ApplicationSetSpec{
|
|
Generators: []v1alpha1.ApplicationSetGenerator{
|
|
{
|
|
Git: &v1alpha1.GitGenerator{
|
|
RepoURL: "https://github.com/argoproj/argo-cd.git",
|
|
Revision: "head",
|
|
Directories: []v1alpha1.GitDirectoryGeneratorItem{
|
|
{
|
|
Path: "applicationset/examples/git-generator-directory/cluster-addons/*",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
Template: v1alpha1.ApplicationSetTemplate{
|
|
Spec: v1alpha1.ApplicationSpec{
|
|
Project: "default",
|
|
},
|
|
},
|
|
},
|
|
Status: v1alpha1.ApplicationSetStatus{
|
|
Conditions: []v1alpha1.ApplicationSetCondition{
|
|
{
|
|
Status: v1alpha1.ApplicationSetConditionStatusTrue,
|
|
Type: v1alpha1.ApplicationSetConditionResourcesUpToDate,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
app2 := &v1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "app-name",
|
|
Namespace: "team-two",
|
|
},
|
|
Spec: v1alpha1.ApplicationSetSpec{
|
|
Generators: []v1alpha1.ApplicationSetGenerator{
|
|
{
|
|
Git: &v1alpha1.GitGenerator{
|
|
RepoURL: "https://github.com/argoproj/argo-cd.git",
|
|
Revision: "head",
|
|
Directories: []v1alpha1.GitDirectoryGeneratorItem{
|
|
{
|
|
Path: "applicationset/examples/git-generator-directory/cluster-addons/*",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
Template: v1alpha1.ApplicationSetTemplate{
|
|
Spec: v1alpha1.ApplicationSpec{
|
|
Project: "default",
|
|
},
|
|
},
|
|
},
|
|
Status: v1alpha1.ApplicationSetStatus{
|
|
Conditions: []v1alpha1.ApplicationSetCondition{
|
|
{
|
|
Status: v1alpha1.ApplicationSetConditionStatusTrue,
|
|
Type: v1alpha1.ApplicationSetConditionResourcesUpToDate,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
output := "table"
|
|
printApplicationSetTable([]v1alpha1.ApplicationSet{*app, *app2}, &output)
|
|
return nil
|
|
})
|
|
require.NoError(t, err)
|
|
expectation := "NAME PROJECT SYNCPOLICY HEALTH CONDITIONS\napp-name default nil [{ResourcesUpToDate <nil> True }]\nteam-two/app-name default nil [{ResourcesUpToDate <nil> True }]\n"
|
|
assert.Equal(t, expectation, output)
|
|
}
|
|
|
|
func TestPrintAppSetSummaryTable(t *testing.T) {
|
|
baseAppSet := &v1alpha1.ApplicationSet{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "app-name",
|
|
},
|
|
Spec: v1alpha1.ApplicationSetSpec{
|
|
Generators: []v1alpha1.ApplicationSetGenerator{
|
|
{
|
|
Git: &v1alpha1.GitGenerator{
|
|
RepoURL: "https://github.com/argoproj/argo-cd.git",
|
|
Revision: "head",
|
|
Directories: []v1alpha1.GitDirectoryGeneratorItem{
|
|
{
|
|
Path: "applicationset/examples/git-generator-directory/cluster-addons/*",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
Template: v1alpha1.ApplicationSetTemplate{
|
|
Spec: v1alpha1.ApplicationSpec{
|
|
Project: "default",
|
|
},
|
|
},
|
|
},
|
|
Status: v1alpha1.ApplicationSetStatus{
|
|
Conditions: []v1alpha1.ApplicationSetCondition{
|
|
{
|
|
Status: v1alpha1.ApplicationSetConditionStatusTrue,
|
|
Type: v1alpha1.ApplicationSetConditionResourcesUpToDate,
|
|
},
|
|
},
|
|
},
|
|
}
|
|
appsetSpecSource := baseAppSet.DeepCopy()
|
|
appsetSpecSource.Spec.Template.Spec.Source = &v1alpha1.ApplicationSource{
|
|
RepoURL: "test1",
|
|
TargetRevision: "master1",
|
|
Path: "/test1",
|
|
}
|
|
|
|
appsetSpecSources := baseAppSet.DeepCopy()
|
|
appsetSpecSources.Spec.Template.Spec.Sources = v1alpha1.ApplicationSources{
|
|
{
|
|
RepoURL: "test1",
|
|
TargetRevision: "master1",
|
|
Path: "/test1",
|
|
},
|
|
{
|
|
RepoURL: "test2",
|
|
TargetRevision: "master2",
|
|
Path: "/test2",
|
|
},
|
|
}
|
|
|
|
appsetSpecSyncPolicy := baseAppSet.DeepCopy()
|
|
appsetSpecSyncPolicy.Spec.SyncPolicy = &v1alpha1.ApplicationSetSyncPolicy{
|
|
PreserveResourcesOnDeletion: true,
|
|
}
|
|
|
|
appSetTemplateSpecSyncPolicy := baseAppSet.DeepCopy()
|
|
appSetTemplateSpecSyncPolicy.Spec.Template.Spec.SyncPolicy = &v1alpha1.SyncPolicy{
|
|
Automated: &v1alpha1.SyncPolicyAutomated{
|
|
SelfHeal: new(true),
|
|
},
|
|
}
|
|
|
|
appSetBothSyncPolicies := baseAppSet.DeepCopy()
|
|
appSetBothSyncPolicies.Spec.SyncPolicy = &v1alpha1.ApplicationSetSyncPolicy{
|
|
PreserveResourcesOnDeletion: true,
|
|
}
|
|
appSetBothSyncPolicies.Spec.Template.Spec.SyncPolicy = &v1alpha1.SyncPolicy{
|
|
Automated: &v1alpha1.SyncPolicyAutomated{
|
|
SelfHeal: new(true),
|
|
},
|
|
}
|
|
|
|
for _, tt := range []struct {
|
|
name string
|
|
appSet *v1alpha1.ApplicationSet
|
|
expectedOutput string
|
|
}{
|
|
{
|
|
name: "appset with only spec.syncPolicy set",
|
|
appSet: appsetSpecSyncPolicy,
|
|
expectedOutput: `Name: app-name
|
|
Project: default
|
|
Server:
|
|
Namespace:
|
|
Health Status:
|
|
Source:
|
|
- Repo:
|
|
Target:
|
|
SyncPolicy: <none>
|
|
`,
|
|
},
|
|
{
|
|
name: "appset with only spec.template.spec.syncPolicy set",
|
|
appSet: appSetTemplateSpecSyncPolicy,
|
|
expectedOutput: `Name: app-name
|
|
Project: default
|
|
Server:
|
|
Namespace:
|
|
Health Status:
|
|
Source:
|
|
- Repo:
|
|
Target:
|
|
SyncPolicy: Automated
|
|
`,
|
|
},
|
|
{
|
|
name: "appset with both spec.SyncPolicy and spec.template.spec.syncPolicy set",
|
|
appSet: appSetBothSyncPolicies,
|
|
expectedOutput: `Name: app-name
|
|
Project: default
|
|
Server:
|
|
Namespace:
|
|
Health Status:
|
|
Source:
|
|
- Repo:
|
|
Target:
|
|
SyncPolicy: Automated
|
|
`,
|
|
},
|
|
{
|
|
name: "appset with a single source",
|
|
appSet: appsetSpecSource,
|
|
expectedOutput: `Name: app-name
|
|
Project: default
|
|
Server:
|
|
Namespace:
|
|
Health Status:
|
|
Source:
|
|
- Repo: test1
|
|
Target: master1
|
|
Path: /test1
|
|
SyncPolicy: <none>
|
|
`,
|
|
},
|
|
{
|
|
name: "appset with a multiple sources",
|
|
appSet: appsetSpecSources,
|
|
expectedOutput: `Name: app-name
|
|
Project: default
|
|
Server:
|
|
Namespace:
|
|
Health Status:
|
|
Sources:
|
|
- Repo: test1
|
|
Target: master1
|
|
Path: /test1
|
|
- Repo: test2
|
|
Target: master2
|
|
Path: /test2
|
|
SyncPolicy: <none>
|
|
`,
|
|
},
|
|
} {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
oldStdout := os.Stdout
|
|
defer func() {
|
|
os.Stdout = oldStdout
|
|
}()
|
|
|
|
r, w, _ := os.Pipe()
|
|
os.Stdout = w
|
|
|
|
printAppSetSummaryTable(tt.appSet)
|
|
w.Close()
|
|
|
|
out, err := io.ReadAll(r)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, tt.expectedOutput, string(out))
|
|
})
|
|
}
|
|
}
|