Files
41536738c8 refactor(cd): hard-fork - rename CRD API group argoproj.io -> deploy.hanzo.ai (#1)
* 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]>
2026-07-29 18:27:58 -07:00

395 lines
15 KiB
Go

package applicationsets
import (
"fmt"
"reflect"
"regexp"
"slices"
"strings"
"testing"
"github.com/hanzoai/deploy/gitops-engine/pkg/diff"
"github.com/hanzoai/deploy/gitops-engine/pkg/health"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
"github.com/hanzoai/deploy/test/e2e/fixture/applicationsets/utils"
)
type state = string
const (
failed = "failed"
pending = "pending"
succeeded = "succeeded"
)
// Expectation returns succeeded on success condition, or pending/failed on failure, along with
// a message to describe the success/failure condition.
type Expectation func(c *Consequences) (state state, message string)
// Success asserts that the last command was successful
func Success(message string) Expectation {
return func(c *Consequences) (state, string) {
if c.actions.lastError != nil {
return failed, fmt.Sprintf("error: %v", c.actions.lastError)
}
if !strings.Contains(c.actions.lastOutput, message) {
return failed, fmt.Sprintf("output did not contain '%s'", message)
}
return succeeded, fmt.Sprintf("no error and output contained '%s'", message)
}
}
// Error asserts that the last command was an error with substring match
func Error(message, err string) Expectation {
return func(c *Consequences) (state, string) {
if c.actions.lastError == nil {
return failed, "no error"
}
if !strings.Contains(c.actions.lastOutput, message) {
return failed, fmt.Sprintf("output does not contain '%s'", message)
}
if !strings.Contains(c.actions.lastError.Error(), err) {
return failed, fmt.Sprintf("error does not contain '%s'", message)
}
return succeeded, fmt.Sprintf("error '%s'", message)
}
}
// ApplicationsExist checks whether each of the 'expectedApps' exist in the namespace, and are
// equivalent to provided values.
func ApplicationsExist(expectedApps []v1alpha1.Application) Expectation {
return func(c *Consequences) (state, string) {
for _, expectedApp := range expectedApps {
foundApp := c.app(expectedApp.Name)
if foundApp == nil {
return pending, fmt.Sprintf("missing app '%s'", expectedApp.QualifiedName())
}
if !appsAreEqual(expectedApp, *foundApp) {
diff, err := getDiff(filterFields(expectedApp), filterFields(*foundApp))
if err != nil {
return failed, err.Error()
}
return pending, fmt.Sprintf("apps are not equal: '%s', diff: %s\n", expectedApp.QualifiedName(), diff)
}
}
return succeeded, "all apps successfully found"
}
}
// ApplicationSetHasHealthStatus checks whether the ApplicationSet has the expected health status.
func ApplicationSetHasHealthStatus(expectedHealthStatus health.HealthStatusCode) Expectation {
return func(c *Consequences) (state, string) {
// retrieve the application set
foundApplicationSet := c.applicationSet(c.context.GetName())
if foundApplicationSet == nil {
return pending, fmt.Sprintf("application set '%s' not found", c.context.GetName())
}
if foundApplicationSet.Status.Health.Status != expectedHealthStatus {
return pending, fmt.Sprintf("application set health status is '%s', expected '%s'",
foundApplicationSet.Status.Health.Status, expectedHealthStatus)
}
return succeeded, fmt.Sprintf("application set has expected health status '%s'", expectedHealthStatus)
}
}
// ApplicationSetHasConditions checks whether each of the 'expectedConditions' exist in the ApplicationSet status, and are
// equivalent to provided values.
func ApplicationSetHasConditions(expectedConditions []v1alpha1.ApplicationSetCondition) Expectation {
return func(c *Consequences) (state, string) {
// retrieve the application set
foundApplicationSet := c.applicationSet(c.context.GetName())
if foundApplicationSet == nil {
return pending, fmt.Sprintf("application set '%s' not found", c.context.GetName())
}
if !conditionsAreEqual(&expectedConditions, &foundApplicationSet.Status.Conditions) {
diff, err := getConditionDiff(expectedConditions, foundApplicationSet.Status.Conditions)
if err != nil {
return failed, err.Error()
}
return pending, fmt.Sprintf("application set conditions are not equal: '%s', diff: %s\n", expectedConditions, diff)
}
return succeeded, "application set successfully found"
}
}
func ApplicationSetHasCondition(expType v1alpha1.ApplicationSetConditionType, expStatus v1alpha1.ApplicationSetConditionStatus, expMessage *regexp.Regexp, expReason string) Expectation {
return func(c *Consequences) (state, string) {
foundApplicationSet := c.applicationSet(c.context.GetName())
if foundApplicationSet == nil {
return pending, fmt.Sprintf("application set '%s' not found", c.context.GetName())
}
got := foundApplicationSet.Status.Conditions
message := fmt.Sprintf("condition {%s %s %s %s} in %v", expType, expMessage, expStatus, expReason, got)
for _, condition := range got {
if expType == condition.Type && expStatus == condition.Status && expReason == condition.Reason && expMessage.MatchString(condition.Message) {
return succeeded, message
}
}
return pending, message
}
}
// ApplicationsDoNotExist checks that each of the 'expectedApps' no longer exist in the namespace
func ApplicationsDoNotExist(expectedApps []v1alpha1.Application) Expectation {
return func(c *Consequences) (state, string) {
for _, expectedApp := range expectedApps {
foundApp := c.app(expectedApp.Name)
if foundApp != nil {
return pending, fmt.Sprintf("app '%s' should no longer exist", expectedApp.QualifiedName())
}
}
return succeeded, "all apps do not exist"
}
}
// Pod checks whether a specified condition is true for any of the pods in the namespace
func Pod(t *testing.T, predicate func(p corev1.Pod) bool) Expectation {
t.Helper()
return func(_ *Consequences) (state, string) {
pods, err := pods(t, utils.ApplicationsResourcesNamespace)
if err != nil {
return failed, err.Error()
}
for _, pod := range pods.Items {
if predicate(pod) {
return succeeded, fmt.Sprintf("pod predicate matched pod named '%s'", pod.GetName())
}
}
return pending, "pod predicate does not match pods"
}
}
func pods(t *testing.T, namespace string) (*corev1.PodList, error) {
t.Helper()
fixtureClient := utils.GetE2EFixtureK8sClient(t)
pods, err := fixtureClient.KubeClientset.CoreV1().Pods(namespace).List(t.Context(), metav1.ListOptions{})
return pods, err
}
// getDiff returns a string containing a comparison result of two applications (for test output/debug purposes)
func getDiff(orig, newApplication v1alpha1.Application) (string, error) {
bytes, _, err := diff.CreateTwoWayMergePatch(orig, newApplication, orig)
if err != nil {
return "", err
}
return string(bytes), nil
}
// getConditionDiff returns a string containing a comparison result of two ApplicationSetCondition (for test output/debug purposes)
func getConditionDiff(orig, newApplicationSetCondition []v1alpha1.ApplicationSetCondition) (string, error) {
if len(orig) != len(newApplicationSetCondition) {
return fmt.Sprintf("mismatch between condition sizes: %v %v", len(orig), len(newApplicationSetCondition)), nil
}
var bytes []byte
for index := range orig {
b, _, err := diff.CreateTwoWayMergePatch(orig[index], newApplicationSetCondition[index], orig[index])
if err != nil {
return "", err
}
bytes = append(bytes, b...)
}
return string(bytes), nil
}
// filterFields returns a copy of Application, but with unnecessary (for testing) fields removed
func filterFields(input v1alpha1.Application) v1alpha1.Application {
spec := input.Spec
metaCopy := input.ObjectMeta.DeepCopy()
output := v1alpha1.Application{
ObjectMeta: metav1.ObjectMeta{
Labels: metaCopy.Labels,
Annotations: metaCopy.Annotations,
Name: metaCopy.Name,
Namespace: metaCopy.Namespace,
Finalizers: metaCopy.Finalizers,
},
Spec: v1alpha1.ApplicationSpec{
Source: &v1alpha1.ApplicationSource{
Path: spec.GetSource().Path,
RepoURL: spec.GetSource().RepoURL,
TargetRevision: spec.GetSource().TargetRevision,
},
Destination: v1alpha1.ApplicationDestination{
Server: spec.Destination.Server,
Name: spec.Destination.Name,
Namespace: spec.Destination.Namespace,
},
Project: spec.Project,
},
}
return output
}
// filterConditionFields returns a copy of ApplicationSetCondition, but with unnecessary (for testing) fields removed
func filterConditionFields(input *[]v1alpha1.ApplicationSetCondition) *[]v1alpha1.ApplicationSetCondition {
var filteredConditions []v1alpha1.ApplicationSetCondition
for _, condition := range *input {
newCondition := &v1alpha1.ApplicationSetCondition{
Type: condition.Type,
Status: condition.Status,
Message: condition.Message,
Reason: condition.Reason,
}
filteredConditions = append(filteredConditions, *newCondition)
}
return &filteredConditions
}
// appsAreEqual returns true if the apps are equal, comparing only fields of interest
func appsAreEqual(one v1alpha1.Application, two v1alpha1.Application) bool {
return reflect.DeepEqual(filterFields(one), filterFields(two))
}
// conditionsAreEqual returns true if the appset status conditions are equal, comparing only fields of interest
func conditionsAreEqual(one, two *[]v1alpha1.ApplicationSetCondition) bool {
return reflect.DeepEqual(filterConditionFields(one), filterConditionFields(two))
}
// CheckProgressiveSyncStatusCodeOfApplications checks whether the progressive sync status codes of applications in ApplicationSetApplicationStatus
// match the expected values.
func CheckProgressiveSyncStatusCodeOfApplications(expectedStatuses map[string]v1alpha1.ApplicationSetApplicationStatus) Expectation {
return func(c *Consequences) (state, string) {
appSet := c.applicationSet(c.context.GetName())
if appSet == nil {
return pending, fmt.Sprintf("no ApplicationSet found with name '%s'", c.context.GetName())
}
if appSet.Status.ApplicationStatus == nil {
return pending, fmt.Sprintf("no application status found for ApplicationSet '%s'", c.context.GetName())
}
for _, appStatus := range appSet.Status.ApplicationStatus {
expectedstatus, found := expectedStatuses[appStatus.Application]
if !found {
continue // Appset has more apps than expected - not ideal
}
if appStatus.Status != expectedstatus.Status {
return pending, fmt.Sprintf("for application '%s': expected status '%s' but got '%s'", expectedstatus.Application, expectedstatus.Status, appStatus.Status)
}
}
return succeeded, fmt.Sprintf("all applications in ApplicationSet's: '%s' Application Status have expected statuses ", c.context.GetName())
}
}
// CheckApplicationInRightSteps checks that a step contains exactly the expected applications.
func CheckApplicationInRightSteps(step string, expectedApps []string) Expectation {
return func(c *Consequences) (state, string) {
appSet := c.applicationSet(c.context.GetName())
if appSet == nil {
return pending, fmt.Sprintf("no application set found with name '%s'", c.context.GetName())
}
if appSet.Status.ApplicationStatus == nil {
return pending, fmt.Sprintf("no application status found for ApplicationSet '%s'", c.context.GetName())
}
var stepApps []string
for _, appStatus := range appSet.Status.ApplicationStatus {
if appStatus.Step == step {
stepApps = append(stepApps, appStatus.Application)
}
}
if len(stepApps) != len(expectedApps) {
return pending, fmt.Sprintf("expected %d apps in step '%s' for appset '%s', but got %d", len(expectedApps), step, c.context.GetName(), len(stepApps))
}
// Sort before comparing to avoid flakiness
slices.Sort(stepApps)
slices.Sort(expectedApps)
if !slices.Equal(stepApps, expectedApps) {
return pending, fmt.Sprintf("In step '%s', expected apps: '%s', but got: '%s'", step, expectedApps, stepApps)
}
return succeeded, fmt.Sprintf("Step '%s' has expected apps: '%s'", step, expectedApps)
}
}
// ApplicationSetDoesNotHaveApplicationStatus checks that ApplicationSet.Status.ApplicationStatus is nil
func ApplicationSetDoesNotHaveApplicationStatus() Expectation {
return func(c *Consequences) (state, string) {
appSet := c.applicationSet(c.context.GetName())
if appSet == nil {
return pending, fmt.Sprintf("no application set found with name '%s'", c.context.GetName())
}
if appSet.Status.ApplicationStatus != nil {
return failed, fmt.Sprintf("application set '%s' has ApplicationStatus when not expected", c.context.GetName())
}
return succeeded, fmt.Sprintf("Application '%s' does not have ApplicationStatus", c.context.GetName())
}
}
// ApplicationSetHasApplicationStatus checks that ApplicationSet has expected number of applications in its status
// and all have progressive sync status Healthy.
func ApplicationSetHasApplicationStatus(expectedApplicationStatusLength int) Expectation {
return func(c *Consequences) (state, string) {
appSet := c.applicationSet(c.context.GetName())
if appSet == nil {
return pending, fmt.Sprintf("no application set found with name '%s'", c.context.GetName())
}
if appSet.Status.ApplicationStatus == nil {
return pending, fmt.Sprintf("application set '%s' has no ApplicationStatus when '%d' expected", c.context.GetName(), expectedApplicationStatusLength)
}
if len(appSet.Status.ApplicationStatus) != expectedApplicationStatusLength {
return failed, fmt.Sprintf("applicationset has '%d' applicationstatus, when '%d' are expected", len(appSet.Status.ApplicationStatus), expectedApplicationStatusLength)
}
for _, appStatus := range appSet.Status.ApplicationStatus {
if appStatus.Status != v1alpha1.ProgressiveSyncHealthy {
return pending, fmt.Sprintf("Application '%s' not Healthy", appStatus.Application)
}
}
return succeeded, fmt.Sprintf("All Applications in ApplicationSet: '%s' are Healthy ", c.context.GetName())
}
}
// ApplicationDeletionStarted verifies at least one application from provided list of appNames has DeletionTimestamp set,
// indicating deletion has begun for this step. Returns failed if any application doesn't exist, does not expect completion of deletion.
func ApplicationDeletionStarted(appNames []string) Expectation {
return func(c *Consequences) (state, string) {
anyapp := false
for _, appName := range appNames {
app := c.app(appName)
if app == nil {
// with test finalizer explicitly added, application should not be deleted
return failed, fmt.Sprintf("no application found with name '%s'", c.context.GetName())
}
if app.DeletionTimestamp != nil {
anyapp = true
}
}
if !anyapp {
return pending, "no app in this step is being deleted yet"
}
return succeeded, fmt.Sprintf("at least one app in %v is being deleted or gone", appNames)
}
}
// ApplicationsExistAndNotBeingDeleted checks that specified apps exist and do NOT have DeletionTimestamp set
func ApplicationsExistAndNotBeingDeleted(appNames []string) Expectation {
return func(c *Consequences) (state, string) {
for _, appName := range appNames {
app := c.app(appName)
if app == nil {
return failed, fmt.Sprintf("app '%s' does not exist but should", appName)
}
if app.DeletionTimestamp != nil {
return failed, fmt.Sprintf("app '%s' is being deleted but should not be yet", appName)
}
}
return succeeded, fmt.Sprintf("all apps %v exist and are not being deleted", appNames)
}
}