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]>
312 lines
11 KiB
Go
312 lines
11 KiB
Go
package e2e
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/types"
|
|
"k8s.io/apimachinery/pkg/util/wait"
|
|
|
|
. "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/test/e2e/fixture/repos"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
)
|
|
|
|
func TestGitSemverResolutionNotUsingConstraint(t *testing.T) {
|
|
Given(t).
|
|
Path("deployment").
|
|
CustomSSHKnownHostsAdded().
|
|
SSHRepoURLAdded(true).
|
|
RepoURLType(fixture.RepoURLTypeSSH).
|
|
Revision("v0.1.0").
|
|
When().
|
|
AddTag("v0.1.0").
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|
|
|
|
func TestGitShallowClone(t *testing.T) {
|
|
Given(t).
|
|
Path("deployment").
|
|
HTTPSInsecureRepoURLAdded(true, repos.WithDepth(1)).
|
|
RepoURLType(fixture.RepoURLTypeHTTPS).
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
When().
|
|
PatchFile("deployment.yaml", `[{"op": "add", "path": "/metadata/labels", "value": {"foo": "bar"}}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|
|
|
|
func TestGitSemverResolutionNotUsingConstraintWithLeadingZero(t *testing.T) {
|
|
Given(t).
|
|
Path("deployment").
|
|
CustomSSHKnownHostsAdded().
|
|
SSHRepoURLAdded(true).
|
|
RepoURLType(fixture.RepoURLTypeSSH).
|
|
Revision("0.1.0").
|
|
When().
|
|
AddTag("0.1.0").
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|
|
|
|
func TestGitSemverResolutionUsingConstraint(t *testing.T) {
|
|
Given(t).
|
|
Path("deployment").
|
|
CustomSSHKnownHostsAdded().
|
|
SSHRepoURLAdded(true).
|
|
RepoURLType(fixture.RepoURLTypeSSH).
|
|
Revision("v0.1.*").
|
|
When().
|
|
AddTag("v0.1.0").
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
When().
|
|
PatchFile("deployment.yaml", `[
|
|
{"op": "replace", "path": "/metadata/name", "value": "new-app"},
|
|
{"op": "replace", "path": "/spec/replicas", "value": 1}
|
|
]`).
|
|
AddTag("v0.1.2").
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(Pod(func(p corev1.Pod) bool { return strings.HasPrefix(p.Name, "new-app") }))
|
|
}
|
|
|
|
func TestGitSemverResolutionUsingConstraintWithLeadingZero(t *testing.T) {
|
|
Given(t).
|
|
Path("deployment").
|
|
CustomSSHKnownHostsAdded().
|
|
SSHRepoURLAdded(true).
|
|
RepoURLType(fixture.RepoURLTypeSSH).
|
|
Revision("0.1.*").
|
|
When().
|
|
AddTag("0.1.0").
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
When().
|
|
PatchFile("deployment.yaml", `[
|
|
{"op": "replace", "path": "/metadata/name", "value": "new-app"},
|
|
{"op": "replace", "path": "/spec/replicas", "value": 1}
|
|
]`).
|
|
AddTag("0.1.2").
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(Pod(func(p corev1.Pod) bool { return strings.HasPrefix(p.Name, "new-app") }))
|
|
}
|
|
|
|
func TestGitSemverResolutionWithTagPrefix(t *testing.T) {
|
|
Given(t).
|
|
Path("deployment").
|
|
CustomSSHKnownHostsAdded().
|
|
SSHRepoURLAdded(true).
|
|
RepoURLType(fixture.RepoURLTypeSSH).
|
|
Revision("v0.1.*").
|
|
TagPrefix("component-a/").
|
|
When().
|
|
AddTag("component-a/v0.1.0").
|
|
AddTag("v9.9.9").
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(app *Application) {
|
|
require.Equal(t, "component-a/", app.Spec.Source.TagPrefix)
|
|
require.NotEmpty(t, app.Status.Sync.Revision)
|
|
})
|
|
}
|
|
|
|
func TestGitSemverResolutionWithTagPrefixMultipleTags(t *testing.T) {
|
|
Given(t).
|
|
Path("deployment").
|
|
CustomSSHKnownHostsAdded().
|
|
SSHRepoURLAdded(true).
|
|
RepoURLType(fixture.RepoURLTypeSSH).
|
|
Revision("v0.1.*").
|
|
TagPrefix("component-a/").
|
|
When().
|
|
AddTag("component-a/v0.1.0").
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(app *Application) {
|
|
require.Equal(t, "component-a/", app.Spec.Source.TagPrefix)
|
|
}).
|
|
When().
|
|
PatchFile("deployment.yaml", `[
|
|
{"op": "replace", "path": "/metadata/name", "value": "new-app"},
|
|
{"op": "replace", "path": "/spec/replicas", "value": 1}
|
|
]`).
|
|
AddTag("component-a/v0.1.2").
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(Pod(func(p corev1.Pod) bool { return strings.HasPrefix(p.Name, "new-app") }))
|
|
}
|
|
|
|
func TestAnnotatedTagInStatusSyncRevision(t *testing.T) {
|
|
Given(t).
|
|
Path(guestbookPath).
|
|
When().
|
|
// Create annotated tag name 'annotated-tag'
|
|
AddAnnotatedTag("annotated-tag", "my-generic-tag-message").
|
|
// Create Application targeting annotated-tag, with automatedSync: true
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Source.TargetRevision = "annotated-tag"
|
|
app.Spec.SyncPolicy = &SyncPolicy{Automated: &SyncPolicyAutomated{Prune: new(true), SelfHeal: new(false)}}
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(app *Application) {
|
|
annotatedTagIDOutput, err := fixture.Run(fixture.TmpDir()+"/testdata.git", "git", "show-ref", "annotated-tag")
|
|
require.NoError(t, err)
|
|
require.NotEmpty(t, annotatedTagIDOutput)
|
|
// example command output:
|
|
// "569798c430515ffe170bdb23e3aafaf8ae24b9ff refs/tags/annotated-tag"
|
|
annotatedTagIDFields := strings.Fields(string(annotatedTagIDOutput))
|
|
require.Len(t, annotatedTagIDFields, 2)
|
|
|
|
targetCommitID, err := fixture.Run(fixture.TmpDir()+"/testdata.git", "git", "rev-parse", "--verify", "annotated-tag^{commit}")
|
|
// example command output:
|
|
// "bcd35965e494273355265b9f0bf85075b6bc5163"
|
|
require.NoError(t, err)
|
|
require.NotEmpty(t, targetCommitID)
|
|
|
|
require.NotEmpty(t, app.Status.Sync.Revision, "revision in sync status should be set by sync operation")
|
|
|
|
require.NotEqual(t, app.Status.Sync.Revision, annotatedTagIDFields[0], "revision should not match the annotated tag id")
|
|
require.Equal(t, app.Status.Sync.Revision, strings.TrimSpace(string(targetCommitID)), "revision SHOULD match the target commit SHA")
|
|
})
|
|
}
|
|
|
|
// Test updates to K8s resources should not trigger a self-heal when self-heal is false.
|
|
func TestAutomatedSelfHealingAgainstAnnotatedTag(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path(guestbookPath).
|
|
When().
|
|
AddAnnotatedTag("annotated-tag", "my-generic-tag-message").
|
|
// App should be auto-synced once created
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Source.TargetRevision = "annotated-tag"
|
|
app.Spec.SyncPolicy = &SyncPolicy{Automated: &SyncPolicyAutomated{Prune: new(true), SelfHeal: new(false)}}
|
|
}).
|
|
Then().
|
|
ExpectConsistently(SyncStatusIs(SyncStatusCodeSynced), WaitDuration, time.Second*10).
|
|
When().
|
|
// Update the annotated tag to a new git commit, that has a new revisionHistoryLimit.
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 10}]`).
|
|
AddAnnotatedTag("annotated-tag", "my-generic-tag-message").
|
|
Refresh(RefreshTypeHard).
|
|
// The Application should update to the new annotated tag value within 10 seconds.
|
|
And(func() {
|
|
// Deployment revisionHistoryLimit should switch to 10
|
|
timeoutErr := wait.PollUntilContextTimeout(t.Context(), 1*time.Second, 10*time.Second, true, func(context.Context) (done bool, err error) {
|
|
deployment, err := fixture.KubeClientset.AppsV1().Deployments(ctx.DeploymentNamespace()).Get(t.Context(), "guestbook-ui", metav1.GetOptions{})
|
|
if err != nil {
|
|
return false, nil
|
|
}
|
|
|
|
revisionHistoryLimit := deployment.Spec.RevisionHistoryLimit
|
|
return revisionHistoryLimit != nil && *revisionHistoryLimit == 10, nil
|
|
})
|
|
require.NoError(t, timeoutErr)
|
|
}).
|
|
// Update the Deployment to a different revisionHistoryLimit
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(fixture.KubeClientset.AppsV1().Deployments(ctx.DeploymentNamespace()).Patch(t.Context(),
|
|
"guestbook-ui", types.MergePatchType, []byte(`{"spec": {"revisionHistoryLimit": 9}}`), metav1.PatchOptions{}))
|
|
}).
|
|
// The revisionHistoryLimit should NOT be self-healed, because selfHealing: false. It should remain at 9.
|
|
And(func() {
|
|
// Wait up to 10 seconds to ensure that deployment revisionHistoryLimit does NOT should switch to 10, it should remain at 9.
|
|
waitErr := wait.PollUntilContextTimeout(t.Context(), 1*time.Second, 10*time.Second, true, func(context.Context) (done bool, err error) {
|
|
deployment, err := fixture.KubeClientset.AppsV1().Deployments(ctx.DeploymentNamespace()).Get(t.Context(), "guestbook-ui", metav1.GetOptions{})
|
|
if err != nil {
|
|
return false, nil
|
|
}
|
|
|
|
revisionHistoryLimit := deployment.Spec.RevisionHistoryLimit
|
|
return revisionHistoryLimit != nil && *revisionHistoryLimit != 9, nil
|
|
})
|
|
require.Error(t, waitErr, "A timeout error should occur, indicating that revisionHistoryLimit never changed from 9")
|
|
})
|
|
}
|
|
|
|
func TestAutomatedSelfHealingAgainstLightweightTag(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path(guestbookPath).
|
|
When().
|
|
AddTag("annotated-tag").
|
|
// App should be auto-synced once created
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Source.TargetRevision = "annotated-tag"
|
|
app.Spec.SyncPolicy = &SyncPolicy{Automated: &SyncPolicyAutomated{Prune: new(true), SelfHeal: new(false)}}
|
|
}).
|
|
Then().
|
|
ExpectConsistently(SyncStatusIs(SyncStatusCodeSynced), WaitDuration, time.Second*10).
|
|
When().
|
|
// Update the annotated tag to a new git commit, that has a new revisionHistoryLimit.
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{"op": "replace", "path": "/spec/revisionHistoryLimit", "value": 10}]`).
|
|
AddTagWithForce("annotated-tag").
|
|
Refresh(RefreshTypeHard).
|
|
// The Application should update to the new annotated tag value within 10 seconds.
|
|
And(func() {
|
|
// Deployment revisionHistoryLimit should switch to 10
|
|
timeoutErr := wait.PollUntilContextTimeout(t.Context(), 1*time.Second, 10*time.Second, true, func(context.Context) (done bool, err error) {
|
|
deployment, err := fixture.KubeClientset.AppsV1().Deployments(ctx.DeploymentNamespace()).Get(t.Context(), "guestbook-ui", metav1.GetOptions{})
|
|
if err != nil {
|
|
return false, nil
|
|
}
|
|
|
|
revisionHistoryLimit := deployment.Spec.RevisionHistoryLimit
|
|
return revisionHistoryLimit != nil && *revisionHistoryLimit == 10, nil
|
|
})
|
|
require.NoError(t, timeoutErr)
|
|
}).
|
|
// Update the Deployment to a different revisionHistoryLimit
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(fixture.KubeClientset.AppsV1().Deployments(ctx.DeploymentNamespace()).Patch(t.Context(),
|
|
"guestbook-ui", types.MergePatchType, []byte(`{"spec": {"revisionHistoryLimit": 9}}`), metav1.PatchOptions{}))
|
|
}).
|
|
// The revisionHistoryLimit should NOT be self-healed, because selfHealing: false
|
|
And(func() {
|
|
// Wait up to 10 seconds to ensure that deployment revisionHistoryLimit does NOT should switch to 10, it should remain at 9.
|
|
waitErr := wait.PollUntilContextTimeout(t.Context(), 1*time.Second, 10*time.Second, true, func(context.Context) (done bool, err error) {
|
|
deployment, err := fixture.KubeClientset.AppsV1().Deployments(ctx.DeploymentNamespace()).Get(t.Context(), "guestbook-ui", metav1.GetOptions{})
|
|
if err != nil {
|
|
return false, nil
|
|
}
|
|
|
|
revisionHistoryLimit := deployment.Spec.RevisionHistoryLimit
|
|
return revisionHistoryLimit != nil && *revisionHistoryLimit != 9, nil
|
|
})
|
|
require.Error(t, waitErr, "A timeout error should occur, indicating that revisionHistoryLimit never changed from 9")
|
|
})
|
|
}
|