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]>
225 lines
7.3 KiB
Go
225 lines
7.3 KiB
Go
package e2e
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/hanzoai/deploy/test/e2e/fixture/project"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
rbacv1 "k8s.io/api/rbac/v1"
|
|
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"
|
|
)
|
|
|
|
const (
|
|
WaitDuration = time.Second
|
|
TimeoutDuration = time.Second * 3
|
|
)
|
|
|
|
func TestSyncWithFeatureDisabled(t *testing.T) {
|
|
Given(t).
|
|
Path("guestbook").
|
|
When().
|
|
WithImpersonationDisabled().
|
|
CreateFromFile(func(app *v1alpha1.Application) {
|
|
app.Spec.SyncPolicy = &v1alpha1.SyncPolicy{Automated: &v1alpha1.SyncPolicyAutomated{}}
|
|
}).
|
|
Then().
|
|
// With the impersonation feature disabled, Application sync should continue to use
|
|
// the control plane service account for the sync operation and the sync should succeed.
|
|
ExpectConsistently(SyncStatusIs(v1alpha1.SyncStatusCodeSynced), WaitDuration, TimeoutDuration).
|
|
Expect(OperationMessageContains("successfully synced"))
|
|
}
|
|
|
|
func TestSyncWithNoDestinationServiceAccountsInProject(t *testing.T) {
|
|
Given(t).
|
|
Path("guestbook").
|
|
When().
|
|
WithImpersonationEnabled("", nil).
|
|
CreateFromFile(func(app *v1alpha1.Application) {
|
|
app.Spec.SyncPolicy = &v1alpha1.SyncPolicy{Automated: &v1alpha1.SyncPolicyAutomated{}}
|
|
}).
|
|
Then().
|
|
// With the impersonation feature enabled, Application sync must fail
|
|
// when there are no destination service accounts configured in AppProject
|
|
ExpectConsistently(SyncStatusIs(v1alpha1.SyncStatusCodeOutOfSync), WaitDuration, TimeoutDuration).
|
|
Expect(OperationMessageContains("no matching service account found for destination server"))
|
|
}
|
|
|
|
func TestSyncWithNoDestinationServiceAccountsAndEnforcementDisabled(t *testing.T) {
|
|
Given(t).
|
|
Path("guestbook").
|
|
When().
|
|
WithImpersonationEnabled("", nil).
|
|
WithImpersonationEnforcementDisabled().
|
|
CreateFromFile(func(app *v1alpha1.Application) {
|
|
app.Spec.SyncPolicy = &v1alpha1.SyncPolicy{Automated: &v1alpha1.SyncPolicyAutomated{}}
|
|
}).
|
|
Then().
|
|
// With the impersonation feature enabled, but not enforced, Application sync must succeed
|
|
// by using the controller service account for the sync operation.
|
|
ExpectConsistently(SyncStatusIs(v1alpha1.SyncStatusCodeSynced), WaitDuration, TimeoutDuration).
|
|
Expect(OperationMessageContains("successfully synced"))
|
|
}
|
|
|
|
func TestSyncWithImpersonateWithSyncServiceAccount(t *testing.T) {
|
|
serviceAccountName := "test-account"
|
|
|
|
projectCtx := project.Given(t)
|
|
appCtx := GivenWithSameState(projectCtx)
|
|
|
|
projectCtx.
|
|
Name("sync-test-project").
|
|
SourceNamespaces([]string{"*"}).
|
|
SourceRepositories([]string{"*"}).
|
|
Destination("*,*").
|
|
DestinationServiceAccounts(
|
|
[]string{
|
|
fmt.Sprintf("%s,%s,%s", "*", projectCtx.DeploymentNamespace(), serviceAccountName),
|
|
fmt.Sprintf("%s,%s,%s", v1alpha1.KubernetesInternalAPIServerAddr, projectCtx.DeploymentNamespace(), "missing-serviceAccount"),
|
|
}).
|
|
When().
|
|
Create().
|
|
Then().
|
|
Expect()
|
|
|
|
appCtx.
|
|
Project(projectCtx.GetName()).
|
|
SetTrackingMethod("annotation").
|
|
Path("guestbook").
|
|
When().
|
|
WithImpersonationEnabled(serviceAccountName, []rbacv1.PolicyRule{
|
|
{
|
|
APIGroups: []string{"apps", ""},
|
|
Resources: []string{"deployments"},
|
|
Verbs: []string{"*"},
|
|
},
|
|
{
|
|
APIGroups: []string{""},
|
|
Resources: []string{"services"},
|
|
Verbs: []string{"*"},
|
|
},
|
|
}).
|
|
CreateFromFile(func(app *v1alpha1.Application) {
|
|
app.Spec.SyncPolicy = &v1alpha1.SyncPolicy{Automated: &v1alpha1.SyncPolicyAutomated{}}
|
|
}).
|
|
Then().
|
|
// With the impersonation feature enabled, Application sync should succeed
|
|
// as there is a valid match found in the available destination service accounts configured in AppProject
|
|
ExpectConsistently(SyncStatusIs(v1alpha1.SyncStatusCodeSynced), WaitDuration, TimeoutDuration).
|
|
Expect(OperationMessageContains("successfully synced"))
|
|
}
|
|
|
|
func TestSyncWithMissingServiceAccount(t *testing.T) {
|
|
serviceAccountName := "test-account"
|
|
|
|
projectCtx := project.Given(t)
|
|
appCtx := GivenWithSameState(projectCtx)
|
|
|
|
projectCtx.
|
|
Name("false-test-project").
|
|
SourceNamespaces([]string{"*"}).
|
|
SourceRepositories([]string{"*"}).
|
|
Destination("*,*").
|
|
DestinationServiceAccounts(
|
|
[]string{
|
|
fmt.Sprintf("%s,%s,%s", v1alpha1.KubernetesInternalAPIServerAddr, projectCtx.DeploymentNamespace(), "missing-serviceAccount"),
|
|
fmt.Sprintf("%s,%s,%s", "*", projectCtx.DeploymentNamespace(), serviceAccountName),
|
|
}).
|
|
When().
|
|
Create().
|
|
Then().
|
|
Expect()
|
|
|
|
appCtx.
|
|
Project(projectCtx.GetName()).
|
|
SetTrackingMethod("annotation").
|
|
Path("guestbook").
|
|
When().
|
|
WithImpersonationEnabled(serviceAccountName, []rbacv1.PolicyRule{
|
|
{
|
|
APIGroups: []string{"apps", ""},
|
|
Resources: []string{"deployments"},
|
|
Verbs: []string{"*"},
|
|
},
|
|
{
|
|
APIGroups: []string{""},
|
|
Resources: []string{"services"},
|
|
Verbs: []string{"*"},
|
|
},
|
|
}).
|
|
CreateFromFile(func(app *v1alpha1.Application) {
|
|
app.Spec.SyncPolicy = &v1alpha1.SyncPolicy{Automated: &v1alpha1.SyncPolicyAutomated{}}
|
|
}).
|
|
Then().
|
|
// With the impersonation feature enabled, Application sync must fail
|
|
// when there is a valid match found in the available destination service accounts configured in AppProject,
|
|
// but the matching service account is missing.
|
|
ExpectConsistently(SyncStatusIs(v1alpha1.SyncStatusCodeOutOfSync), WaitDuration, TimeoutDuration).
|
|
Expect(OperationMessageContains("one or more objects failed to apply"))
|
|
}
|
|
|
|
func TestSyncWithValidSAButDisallowedDestination(t *testing.T) {
|
|
serviceAccountName := "test-account"
|
|
|
|
projectCtx := project.Given(t)
|
|
appCtx := GivenWithSameState(projectCtx)
|
|
|
|
projectCtx.
|
|
Name("negation-test-project").
|
|
SourceNamespaces([]string{"*"}).
|
|
SourceRepositories([]string{"*"}).
|
|
Destination("*,*").
|
|
DestinationServiceAccounts(
|
|
[]string{
|
|
fmt.Sprintf("%s,%s,%s", "*", projectCtx.DeploymentNamespace(), serviceAccountName),
|
|
}).
|
|
When().
|
|
Create().
|
|
Then().
|
|
Expect()
|
|
|
|
appCtx.
|
|
Project(projectCtx.GetName()).
|
|
SetTrackingMethod("annotation").
|
|
Path("guestbook").
|
|
When().
|
|
WithImpersonationEnabled(serviceAccountName, []rbacv1.PolicyRule{
|
|
{
|
|
APIGroups: []string{"apps", ""},
|
|
Resources: []string{"deployments"},
|
|
Verbs: []string{"*"},
|
|
},
|
|
{
|
|
APIGroups: []string{""},
|
|
Resources: []string{"services"},
|
|
Verbs: []string{"*"},
|
|
},
|
|
}).
|
|
CreateFromFile(func(app *v1alpha1.Application) {
|
|
app.Spec.SyncPolicy = &v1alpha1.SyncPolicy{Automated: &v1alpha1.SyncPolicyAutomated{}}
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(v1alpha1.SyncStatusCodeSynced)).
|
|
When().
|
|
And(func() {
|
|
// Patch destination to disallow target destination namespace
|
|
patch := fmt.Appendf(nil, `{"spec": {"destinations": [{"namespace": %q}]}}`, "!"+appCtx.DeploymentNamespace())
|
|
|
|
_, err := fixture.AppClientset.ArgoprojV1alpha1().AppProjects(fixture.TestNamespace()).Patch(t.Context(), projectCtx.GetName(), types.MergePatchType, patch, metav1.PatchOptions{})
|
|
require.NoError(t, err)
|
|
}).
|
|
Refresh(v1alpha1.RefreshTypeNormal).
|
|
Then().
|
|
// With the impersonation feature enabled, Application sync must fail
|
|
// as there is a valid match found in the available destination service accounts configured in AppProject
|
|
// but the destination namespace is now disallowed.
|
|
ExpectConsistently(SyncStatusIs(v1alpha1.SyncStatusCodeUnknown), WaitDuration, TimeoutDuration)
|
|
}
|