mirror of
https://github.com/hanzoai/cd.git
synced 2026-10-30 14:56:45 +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]>
262 lines
8.1 KiB
Go
262 lines
8.1 KiB
Go
package controller
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/reposerver/apiclient"
|
|
"github.com/hanzoai/deploy/test"
|
|
"github.com/hanzoai/deploy/util/settings"
|
|
)
|
|
|
|
func TestGetRepoObjs(t *testing.T) {
|
|
cm := test.NewConfigMap()
|
|
cm.SetAnnotations(map[string]string{
|
|
"custom-annotation": "custom-value",
|
|
common.AnnotationInstallationID: "id", // tracking annotation should be removed
|
|
common.AnnotationKeyAppInstance: "my-app", // tracking annotation should be removed
|
|
})
|
|
cmBytes, _ := json.Marshal(cm)
|
|
|
|
app := newFakeApp()
|
|
// Enable the manifest-generate-paths annotation and set a synced revision
|
|
app.SetAnnotations(map[string]string{v1alpha1.AnnotationKeyManifestGeneratePaths: "."})
|
|
app.Status.Sync = v1alpha1.SyncStatus{
|
|
Revision: "abc123",
|
|
Status: v1alpha1.SyncStatusCodeSynced,
|
|
}
|
|
|
|
data := fakeData{
|
|
manifestResponse: &apiclient.ManifestResponse{
|
|
Manifests: []string{string(cmBytes)},
|
|
Namespace: test.FakeDestNamespace,
|
|
Server: test.FakeClusterURL,
|
|
Revision: "abc123",
|
|
},
|
|
}
|
|
|
|
ctrl := newFakeControllerWithResync(t.Context(), &data, time.Minute, nil, errors.New("this should not be called"))
|
|
source := app.Spec.GetSource()
|
|
source.RepoURL = "oci://example.com/argo/argo-cd"
|
|
|
|
objs, resp, err := ctrl.GetRepoObjs(t.Context(), app, source, "abc123", &v1alpha1.AppProject{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "default",
|
|
Namespace: test.FakeArgoCDNamespace,
|
|
},
|
|
Spec: v1alpha1.AppProjectSpec{
|
|
SourceRepos: []string{"*"},
|
|
Destinations: []v1alpha1.ApplicationDestination{
|
|
{
|
|
Server: "*",
|
|
Namespace: "*",
|
|
},
|
|
},
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, resp)
|
|
assert.Equal(t, "abc123", resp.Revision)
|
|
assert.Len(t, objs, 1)
|
|
|
|
annotations := objs[0].GetAnnotations()
|
|
|
|
// only the tracking annotations set by Argo CD should be removed
|
|
// and not the custom annotations set by user
|
|
require.NotNil(t, annotations)
|
|
assert.Equal(t, "custom-value", annotations["custom-annotation"])
|
|
assert.NotContains(t, annotations, common.AnnotationInstallationID)
|
|
assert.NotContains(t, annotations, common.AnnotationKeyAppInstance)
|
|
|
|
assert.Equal(t, "ConfigMap", objs[0].GetKind())
|
|
}
|
|
|
|
// TestGetRepoObjs_SourceIntegrity_Wiring asserts the controller-level wiring of
|
|
// source integrity verification: the project's effective SourceIntegrity is
|
|
// passed through to repo-server in the ManifestRequest during hydration.
|
|
func TestGetRepoObjs_SourceIntegrity_Wiring(t *testing.T) {
|
|
proj := &v1alpha1.AppProject{
|
|
ObjectMeta: metav1.ObjectMeta{Name: "default", Namespace: test.FakeArgoCDNamespace},
|
|
Spec: v1alpha1.AppProjectSpec{
|
|
SourceRepos: []string{"*"},
|
|
Destinations: []v1alpha1.ApplicationDestination{{Server: "*", Namespace: "*"}},
|
|
SourceIntegrity: &v1alpha1.SourceIntegrity{
|
|
Git: &v1alpha1.SourceIntegrityGit{
|
|
Policies: []*v1alpha1.SourceIntegrityGitPolicy{{
|
|
Repos: []v1alpha1.SourceIntegrityGitPolicyRepo{{URL: "*"}},
|
|
GPG: &v1alpha1.SourceIntegrityGitPolicyGPG{
|
|
Mode: v1alpha1.SourceIntegrityGitPolicyGPGModeStrict,
|
|
Keys: []string{"4AEE18F83AFDEB23"},
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
cm := test.NewConfigMap()
|
|
cmBytes, _ := json.Marshal(cm)
|
|
|
|
var captured *apiclient.ManifestRequest
|
|
data := fakeData{
|
|
manifestResponse: &apiclient.ManifestResponse{
|
|
Manifests: []string{string(cmBytes)},
|
|
Namespace: test.FakeDestNamespace,
|
|
Server: test.FakeClusterURL,
|
|
Revision: "abc123",
|
|
},
|
|
onGenerateManifest: func(req *apiclient.ManifestRequest) { captured = req },
|
|
}
|
|
ctrl := newFakeControllerWithResync(t.Context(), &data, time.Minute, nil, errors.New("this should not be called"))
|
|
|
|
app := newFakeApp()
|
|
_, _, err := ctrl.GetRepoObjs(t.Context(), app, app.Spec.GetSource(), "abc123", proj)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, captured, "repo-server was not called")
|
|
require.NotNil(t, captured.SourceIntegrity, "expected SourceIntegrity to be forwarded to repo-server")
|
|
assert.NotNil(t, captured.SourceIntegrity.Git)
|
|
}
|
|
|
|
func TestGetHydratorCommitMessageTemplate_WhenTemplateisNotDefined_FallbackToDefault(t *testing.T) {
|
|
cm := test.NewConfigMap()
|
|
cmBytes, _ := json.Marshal(cm)
|
|
|
|
data := fakeData{
|
|
manifestResponse: &apiclient.ManifestResponse{
|
|
Manifests: []string{string(cmBytes)},
|
|
Namespace: test.FakeDestNamespace,
|
|
Server: test.FakeClusterURL,
|
|
Revision: "abc123",
|
|
},
|
|
}
|
|
|
|
ctrl := newFakeControllerWithResync(t.Context(), &data, time.Minute, nil, errors.New("this should not be called"))
|
|
|
|
tmpl, err := ctrl.GetHydratorCommitMessageTemplate()
|
|
require.NoError(t, err)
|
|
assert.NotEmpty(t, tmpl) // should fallback to default
|
|
assert.Equal(t, settings.CommitMessageTemplate, tmpl)
|
|
}
|
|
|
|
func TestGetHydratorCommitMessageTemplate(t *testing.T) {
|
|
cm := test.NewFakeConfigMap()
|
|
cm.Data["sourceHydrator.commitMessageTemplate"] = settings.CommitMessageTemplate
|
|
cmBytes, _ := json.Marshal(cm)
|
|
|
|
data := fakeData{
|
|
manifestResponse: &apiclient.ManifestResponse{
|
|
Manifests: []string{string(cmBytes)},
|
|
Namespace: test.FakeDestNamespace,
|
|
Server: test.FakeClusterURL,
|
|
Revision: "abc123",
|
|
},
|
|
configMapData: cm.Data,
|
|
}
|
|
|
|
ctrl := newFakeControllerWithResync(t.Context(), &data, time.Minute, nil, errors.New("this should not be called"))
|
|
|
|
tmpl, err := ctrl.GetHydratorCommitMessageTemplate()
|
|
require.NoError(t, err)
|
|
assert.NotEmpty(t, tmpl)
|
|
}
|
|
|
|
func TestGetHydratorReadmeMessageTemplate_WhenTemplateIsNotDefined_FallbackToDefault(t *testing.T) {
|
|
cm := test.NewConfigMap()
|
|
cmBytes, _ := json.Marshal(cm)
|
|
|
|
data := fakeData{
|
|
manifestResponse: &apiclient.ManifestResponse{
|
|
Manifests: []string{string(cmBytes)},
|
|
Namespace: test.FakeDestNamespace,
|
|
Server: test.FakeClusterURL,
|
|
Revision: "abc123",
|
|
},
|
|
}
|
|
|
|
ctrl := newFakeControllerWithResync(t.Context(), &data, time.Minute, nil, errors.New("this should not be called"))
|
|
|
|
tmpl, err := ctrl.GetHydratorReadmeMessageTemplate()
|
|
require.NoError(t, err)
|
|
assert.NotEmpty(t, tmpl)
|
|
assert.Equal(t, settings.DefaultManifestHydrationReadmeTemplate, tmpl)
|
|
}
|
|
|
|
func TestGetHydratorReadmeMessageTemplate(t *testing.T) {
|
|
readmeTemplate := `hello world`
|
|
cm := test.NewFakeConfigMap()
|
|
cm.Data["sourceHydrator.readmeMessageTemplate"] = readmeTemplate
|
|
cmBytes, _ := json.Marshal(cm)
|
|
|
|
data := fakeData{
|
|
manifestResponse: &apiclient.ManifestResponse{
|
|
Manifests: []string{string(cmBytes)},
|
|
Namespace: test.FakeDestNamespace,
|
|
Server: test.FakeClusterURL,
|
|
Revision: "abc123",
|
|
},
|
|
configMapData: cm.Data,
|
|
}
|
|
|
|
ctrl := newFakeControllerWithResync(t.Context(), &data, time.Minute, nil, errors.New("this should not be called"))
|
|
|
|
tmpl, err := ctrl.GetHydratorReadmeMessageTemplate()
|
|
require.NoError(t, err)
|
|
assert.NotEmpty(t, tmpl)
|
|
assert.Equal(t, readmeTemplate, tmpl)
|
|
}
|
|
|
|
func TestEvaluateAppRevisionsChanges(t *testing.T) {
|
|
app := newFakeApp()
|
|
app.Spec.SourceHydrator = &v1alpha1.SourceHydrator{
|
|
DrySource: v1alpha1.DrySource{
|
|
RepoURL: app.Spec.Source.RepoURL,
|
|
TargetRevision: app.Spec.Source.TargetRevision,
|
|
Path: app.Spec.Source.Path,
|
|
},
|
|
SyncSource: v1alpha1.SyncSource{
|
|
TargetBranch: "hydrated",
|
|
Path: "hydrated/path",
|
|
},
|
|
}
|
|
app.Status.SourceHydrator.LastComparedDryRevision = "old-sha"
|
|
|
|
data := fakeData{
|
|
resolveRevisionResponses: []*apiclient.ResolveRevisionResponse{
|
|
{
|
|
Revision: "new-sha",
|
|
AmbiguousRevision: app.Spec.SourceHydrator.GetDrySource().TargetRevision,
|
|
},
|
|
},
|
|
}
|
|
|
|
ctrl := newFakeController(t.Context(), &data, nil)
|
|
drySource := app.Spec.SourceHydrator.GetDrySource()
|
|
|
|
hasChanges, resolvedRev, err := ctrl.EvaluateAppRevisionsChanges(t.Context(), app, drySource, "HEAD", &v1alpha1.AppProject{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "default",
|
|
Namespace: test.FakeArgoCDNamespace,
|
|
},
|
|
Spec: v1alpha1.AppProjectSpec{
|
|
SourceRepos: []string{"*"},
|
|
Destinations: []v1alpha1.ApplicationDestination{
|
|
{
|
|
Server: "*",
|
|
Namespace: "*",
|
|
},
|
|
},
|
|
},
|
|
}, false)
|
|
require.NoError(t, err)
|
|
assert.True(t, hasChanges)
|
|
assert.Equal(t, "new-sha", resolvedRev)
|
|
}
|