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]>
261 lines
8.8 KiB
Go
261 lines
8.8 KiB
Go
package e2e
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
applicationpkg "github.com/hanzoai/deploy/pkg/apiclient/application"
|
|
clusterpkg "github.com/hanzoai/deploy/pkg/apiclient/cluster"
|
|
"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/io"
|
|
)
|
|
|
|
// TestCrossNamespaceOwnership tests that Argo CD correctly tracks parent-child relationships
|
|
// when a cluster-scoped resource (ClusterRole) owns namespaced resources (Roles) across different namespaces.
|
|
// This validates the fix for supporting cluster-scoped parents with namespaced children in resource trees.
|
|
func TestCrossNamespaceOwnership(t *testing.T) {
|
|
var clusterRoleUID string
|
|
|
|
ctx := Given(t)
|
|
ctx.
|
|
Path("cross-namespace-ownership").
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(v1alpha1.SyncStatusCodeSynced)).
|
|
And(func(_ *v1alpha1.Application) {
|
|
// Get the UID of the ClusterRole that was created
|
|
output, err := Run("", "kubectl", "get", "clusterrole", "test-cluster-role",
|
|
"-o", "jsonpath={.metadata.uid}")
|
|
require.NoError(t, err)
|
|
clusterRoleUID = output
|
|
t.Logf("ClusterRole UID: %s", clusterRoleUID)
|
|
}).
|
|
When().
|
|
And(func() {
|
|
// Create a Role in the app's destination namespace with an ownerReference to the ClusterRole
|
|
roleYaml := fmt.Sprintf(`apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: Role
|
|
metadata:
|
|
name: test-role-same-ns
|
|
namespace: %s
|
|
ownerReferences:
|
|
- apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: ClusterRole
|
|
name: test-cluster-role
|
|
uid: %s
|
|
rules:
|
|
- apiGroups: [""]
|
|
resources: ["configmaps"]
|
|
verbs: ["get", "list"]`, ctx.DeploymentNamespace(), clusterRoleUID)
|
|
|
|
_, err := Run("", "sh", "-c", fmt.Sprintf("echo '%s' | kubectl apply -f -", roleYaml))
|
|
require.NoError(t, err)
|
|
t.Logf("Created Role in app namespace: %s", ctx.DeploymentNamespace())
|
|
|
|
// Create another namespace for cross-namespace testing
|
|
otherNamespace := ctx.DeploymentNamespace() + "-other"
|
|
_, err = Run("", "kubectl", "create", "namespace", otherNamespace)
|
|
if err != nil {
|
|
// Namespace might already exist, that's ok
|
|
t.Logf("Namespace %s may already exist: %v", otherNamespace, err)
|
|
}
|
|
|
|
// Create a Role in a different namespace with an ownerReference to the ClusterRole
|
|
roleYaml2 := fmt.Sprintf(`apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: Role
|
|
metadata:
|
|
name: test-role-other-ns
|
|
namespace: %s
|
|
ownerReferences:
|
|
- apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: ClusterRole
|
|
name: test-cluster-role
|
|
uid: %s
|
|
rules:
|
|
- apiGroups: [""]
|
|
resources: ["secrets"]
|
|
verbs: ["get", "list"]`, otherNamespace, clusterRoleUID)
|
|
|
|
_, err = Run("", "sh", "-c", fmt.Sprintf("echo '%s' | kubectl apply -f -", roleYaml2))
|
|
require.NoError(t, err)
|
|
t.Logf("Created Role in other namespace: %s", otherNamespace)
|
|
|
|
// Give the cache a moment to pick up the changes
|
|
time.Sleep(2 * time.Second)
|
|
|
|
// Invalidate the cluster cache to force rebuild of orphaned children index
|
|
t.Log("Invalidating cluster cache to rebuild orphaned children index...")
|
|
closer, clusterClient, err := ArgoCDClientset.NewClusterClient()
|
|
require.NoError(t, err)
|
|
defer io.Close(closer)
|
|
|
|
// Invalidate cache for the default cluster (https://kubernetes.default.svc)
|
|
cluster, err := clusterClient.InvalidateCache(t.Context(), &clusterpkg.ClusterQuery{
|
|
Server: "https://kubernetes.default.svc",
|
|
})
|
|
if err != nil {
|
|
t.Logf("Warning: Failed to invalidate cache: %v", err)
|
|
} else {
|
|
t.Logf("Cache invalidated successfully, cluster status: %s", cluster.Info.ConnectionState.Status)
|
|
}
|
|
|
|
// Wait for cache to rebuild
|
|
time.Sleep(3 * time.Second)
|
|
}).
|
|
Refresh(v1alpha1.RefreshTypeHard). // Now refresh to get the updated resource tree
|
|
Then().
|
|
And(func(app *v1alpha1.Application) {
|
|
// Now check the resource tree to verify both Roles show up as children of the ClusterRole
|
|
closer, cdClient := ArgoCDClientset.NewApplicationClientOrDie()
|
|
defer io.Close(closer)
|
|
|
|
tree, err := cdClient.ResourceTree(t.Context(), &applicationpkg.ResourcesQuery{
|
|
ApplicationName: &app.Name,
|
|
AppNamespace: &app.Namespace,
|
|
})
|
|
require.NoError(t, err)
|
|
require.NotNil(t, tree)
|
|
|
|
// Find the ClusterRole in the tree
|
|
var clusterRoleNode *v1alpha1.ResourceNode
|
|
for _, node := range tree.Nodes {
|
|
if node.Kind == "ClusterRole" && node.Name == "test-cluster-role" {
|
|
clusterRoleNode = &node
|
|
break
|
|
}
|
|
}
|
|
require.NotNil(t, clusterRoleNode, "ClusterRole not found in resource tree")
|
|
t.Logf("Found ClusterRole in tree: %s, namespace: '%s'", clusterRoleNode.Name, clusterRoleNode.Namespace)
|
|
|
|
// Find both Roles and verify they reference the ClusterRole as their parent
|
|
var roleSameNs, roleOtherNs *v1alpha1.ResourceNode
|
|
for _, node := range tree.Nodes {
|
|
if node.Kind == "Role" {
|
|
t.Logf("Found Role: %s in namespace '%s' with parent refs: %v",
|
|
node.Name, node.Namespace, node.ParentRefs)
|
|
|
|
// Log parent namespace values
|
|
for _, parent := range node.ParentRefs {
|
|
t.Logf(" Parent ref: Kind=%s, Name=%s, Namespace='%s'",
|
|
parent.Kind, parent.Name, parent.Namespace)
|
|
}
|
|
|
|
switch node.Name {
|
|
case "test-role-same-ns":
|
|
roleSameNs = &node
|
|
case "test-role-other-ns":
|
|
roleOtherNs = &node
|
|
}
|
|
}
|
|
}
|
|
|
|
// Verify both roles were found
|
|
require.NotNil(t, roleSameNs, "Role in same namespace not found in resource tree")
|
|
require.NotNil(t, roleOtherNs, "Role in other namespace not found in resource tree")
|
|
|
|
// Verify both roles have the ClusterRole as their parent
|
|
assert.Len(t, roleSameNs.ParentRefs, 1, "Role in same namespace should have one parent")
|
|
assert.Equal(t, "ClusterRole", roleSameNs.ParentRefs[0].Kind)
|
|
assert.Equal(t, "test-cluster-role", roleSameNs.ParentRefs[0].Name)
|
|
assert.Equal(t, string(clusterRoleUID), roleSameNs.ParentRefs[0].UID)
|
|
|
|
assert.Len(t, roleOtherNs.ParentRefs, 1, "Role in other namespace should have one parent")
|
|
assert.Equal(t, "ClusterRole", roleOtherNs.ParentRefs[0].Kind)
|
|
assert.Equal(t, "test-cluster-role", roleOtherNs.ParentRefs[0].Name)
|
|
assert.Equal(t, string(clusterRoleUID), roleOtherNs.ParentRefs[0].UID)
|
|
|
|
t.Log("✓ Both Roles correctly show ClusterRole as their parent in the resource tree")
|
|
}).
|
|
When().
|
|
Delete(true).
|
|
Then().
|
|
Expect(DoesNotExist())
|
|
}
|
|
|
|
// TestCrossNamespaceOwnershipWithRefresh tests that cross-namespace relationships are maintained
|
|
// after a cluster cache refresh/invalidation
|
|
func TestCrossNamespaceOwnershipWithRefresh(t *testing.T) {
|
|
var clusterRoleUID string
|
|
|
|
ctx := Given(t)
|
|
ctx.
|
|
Path("cross-namespace-ownership").
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(v1alpha1.SyncStatusCodeSynced)).
|
|
And(func(_ *v1alpha1.Application) {
|
|
// Get the UID of the ClusterRole
|
|
output, err := Run("", "kubectl", "get", "clusterrole", "test-cluster-role",
|
|
"-o", "jsonpath={.metadata.uid}")
|
|
require.NoError(t, err)
|
|
clusterRoleUID = output
|
|
}).
|
|
When().
|
|
And(func() {
|
|
// Create a Role with an ownerReference to the ClusterRole
|
|
roleYaml := fmt.Sprintf(`apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: Role
|
|
metadata:
|
|
name: test-role-refresh
|
|
namespace: %s
|
|
ownerReferences:
|
|
- apiVersion: rbac.authorization.k8s.io/v1
|
|
kind: ClusterRole
|
|
name: test-cluster-role
|
|
uid: %s
|
|
rules:
|
|
- apiGroups: [""]
|
|
resources: ["configmaps"]
|
|
verbs: ["get", "list"]`, ctx.DeploymentNamespace(), clusterRoleUID)
|
|
|
|
_, err := Run("", "sh", "-c", fmt.Sprintf("echo '%s' | kubectl apply -f -", roleYaml))
|
|
require.NoError(t, err)
|
|
|
|
// Give the cache a moment to pick up the changes
|
|
time.Sleep(2 * time.Second)
|
|
}).
|
|
Refresh(v1alpha1.RefreshTypeHard). // Force a hard refresh to invalidate the cache
|
|
Then().
|
|
And(func(app *v1alpha1.Application) {
|
|
// Verify the relationship is still tracked after refresh
|
|
closer, cdClient := ArgoCDClientset.NewApplicationClientOrDie()
|
|
defer io.Close(closer)
|
|
|
|
tree, err := cdClient.ResourceTree(t.Context(), &applicationpkg.ResourcesQuery{
|
|
ApplicationName: &app.Name,
|
|
AppNamespace: &app.Namespace,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
// Find the Role and verify it still has the ClusterRole as parent
|
|
var roleNode *v1alpha1.ResourceNode
|
|
for _, node := range tree.Nodes {
|
|
if node.Kind == "Role" && node.Name == "test-role-refresh" {
|
|
roleNode = &node
|
|
break
|
|
}
|
|
}
|
|
|
|
require.NotNil(t, roleNode, "Role not found in resource tree after refresh")
|
|
assert.Len(t, roleNode.ParentRefs, 1, "Role should have one parent after refresh")
|
|
assert.Equal(t, "ClusterRole", roleNode.ParentRefs[0].Kind)
|
|
assert.Equal(t, "test-cluster-role", roleNode.ParentRefs[0].Name)
|
|
|
|
t.Log("✓ Cross-namespace relationship maintained after cache refresh")
|
|
}).
|
|
When().
|
|
Delete(true).
|
|
Then().
|
|
Expect(DoesNotExist())
|
|
}
|