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]>
213 lines
7.9 KiB
Go
213 lines
7.9 KiB
Go
package e2e
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
"time"
|
|
|
|
. "github.com/hanzoai/deploy/gitops-engine/pkg/sync/common"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/types"
|
|
|
|
. "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"
|
|
)
|
|
|
|
func TestAutoSyncSelfHealDisabled(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path(guestbookPath).
|
|
When().
|
|
// app should be auto-synced once created
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.SyncPolicy = &SyncPolicy{Automated: &SyncPolicyAutomated{SelfHeal: new(false)}}
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
// app should be auto-synced if git change detected
|
|
When().
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 1}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
// app should not be auto-synced if k8s change detected
|
|
When().
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(fixture.KubeClientset.AppsV1().Deployments(ctx.DeploymentNamespace()).Patch(t.Context(),
|
|
"guestbook-ui", types.MergePatchType, []byte(`{"spec": {"revisionHistoryLimit": 0}}`), metav1.PatchOptions{}))
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync))
|
|
}
|
|
|
|
func TestAutoSyncSelfHealEnabled(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path(guestbookPath).
|
|
When().
|
|
// app should be auto-synced once created
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.SyncPolicy = &SyncPolicy{
|
|
Automated: &SyncPolicyAutomated{SelfHeal: new(true)},
|
|
Retry: &RetryStrategy{Limit: 0},
|
|
}
|
|
}).
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
When().
|
|
// app should be auto-synced once k8s change detected
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(fixture.KubeClientset.AppsV1().Deployments(ctx.DeploymentNamespace()).Patch(t.Context(),
|
|
"guestbook-ui", types.MergePatchType, []byte(`{"spec": {"revisionHistoryLimit": 0}}`), metav1.PatchOptions{}))
|
|
}).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
When().
|
|
// app should be attempted to auto-synced once and marked with error after failed attempt detected
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": "badValue"}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationFailed)).
|
|
When().
|
|
// Trigger refresh again to make sure controller notices previously failed sync attempt before expectation timeout expires
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
Expect(Condition(ApplicationConditionSyncError, "Failed last sync attempt")).
|
|
When().
|
|
// SyncError condition should be removed after successful sync
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 1}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
When().
|
|
// Trigger refresh twice to make sure controller notices successful attempt and removes condition
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(app *Application) {
|
|
assert.Empty(t, app.Status.Conditions)
|
|
})
|
|
}
|
|
|
|
// TestAutoSyncRetryAndRefreshEnabled verifies that auto-sync+refresh picks up new commits automatically
|
|
func TestAutoSyncRetryAndRefreshEnabled(t *testing.T) {
|
|
Given(t).
|
|
Path(guestbookPath).
|
|
When(). // I create an app with auto-sync and Refresh
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.SyncPolicy = &SyncPolicy{
|
|
Automated: &SyncPolicyAutomated{},
|
|
Retry: &RetryStrategy{
|
|
Limit: -1,
|
|
Refresh: true,
|
|
Backoff: &Backoff{
|
|
Duration: time.Second.String(),
|
|
Factor: new(int64(1)),
|
|
MaxDuration: time.Second.String(),
|
|
},
|
|
},
|
|
}
|
|
}).
|
|
Then(). // It should auto-sync correctly
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(NoConditions()).
|
|
When(). // Auto-sync encounters broken commit
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": "badValue"}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then(). // It should keep on trying to sync it
|
|
Expect(OperationPhaseIs(OperationRunning)).
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
Expect(OperationRetriedMinimumTimes(1)).
|
|
When(). // I push a fixed commit (while auto-sync in progress)
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 42}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
// Argo CD should pick it up and sync it successfully
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|
|
|
|
// TestAutoSyncRetryAndRefreshEnabled verifies that auto-sync+refresh picks up new commits automatically on the original source
|
|
// at the time the sync was triggered
|
|
func TestAutoSyncRetryAndRefreshEnabledChangedSource(t *testing.T) {
|
|
Given(t).
|
|
Path(guestbookPath).
|
|
When(). // I create an app with auto-sync and Refresh
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.SyncPolicy = &SyncPolicy{
|
|
Automated: &SyncPolicyAutomated{},
|
|
Retry: &RetryStrategy{
|
|
Limit: -1, // Repeat forever
|
|
Refresh: true,
|
|
Backoff: &Backoff{
|
|
Duration: time.Second.String(),
|
|
Factor: new(int64(1)),
|
|
MaxDuration: time.Second.String(),
|
|
},
|
|
},
|
|
}
|
|
}).
|
|
Then(). // It should auto-sync correctly
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(NoConditions()).
|
|
When(). // Auto-sync encounters broken commit
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": "badValue"}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then(). // It should keep on trying to sync it
|
|
Expect(OperationPhaseIs(OperationRunning)).
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
Expect(OperationRetriedMinimumTimes(1)).
|
|
When().
|
|
PatchApp(`[{"op": "add", "path": "/spec/source/path", "value": "failure-during-sync"}]`).
|
|
// push a fixed commit on HEAD branch
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 42}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(Status(func(status ApplicationStatus) (bool, string) {
|
|
// Validate that the history contains the sync to the previous sources
|
|
// The history will only contain successful sync
|
|
if len(status.History) != 2 {
|
|
return false, "expected len to be 2"
|
|
}
|
|
if status.History[1].Source.Path != guestbookPath {
|
|
return false, fmt.Sprintf("expected source path to be '%s'", guestbookPath)
|
|
}
|
|
return true, ""
|
|
}))
|
|
}
|
|
|
|
// TestAutoSyncAllowEmptyCanBeDisabled verifies that setting allowEmpty=false via CLI is persisted.
|
|
// Regression test: with bool+omitempty, false was silently dropped from JSON so the field could never be unset.
|
|
func TestAutoSyncAllowEmptyCanBeDisabled(t *testing.T) {
|
|
Given(t).
|
|
Path(guestbookPath).
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.SyncPolicy = &SyncPolicy{
|
|
Automated: &SyncPolicyAutomated{AllowEmpty: new(true)},
|
|
}
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(app *Application) {
|
|
require.NotNil(t, app.Spec.SyncPolicy.Automated.AllowEmpty)
|
|
assert.True(t, *app.Spec.SyncPolicy.Automated.AllowEmpty)
|
|
}).
|
|
When().
|
|
AppSet("--allow-empty=false").
|
|
Then().
|
|
And(func(app *Application) {
|
|
require.NotNil(t, app.Spec.SyncPolicy.Automated.AllowEmpty, "allowEmpty should not be nil after being explicitly set to false")
|
|
assert.False(t, *app.Spec.SyncPolicy.Automated.AllowEmpty, "allowEmpty=false should be persisted, not silently dropped")
|
|
})
|
|
}
|