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]>
118 lines
3.9 KiB
Go
118 lines
3.9 KiB
Go
package sync
|
|
|
|
import (
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
"k8s.io/apimachinery/pkg/types"
|
|
|
|
hookutil "github.com/hanzoai/deploy/gitops-engine/pkg/sync/hook"
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/sync/ignore"
|
|
kubeutil "github.com/hanzoai/deploy/gitops-engine/pkg/utils/kube"
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/utils/text"
|
|
)
|
|
|
|
func splitHooks(target []*unstructured.Unstructured) ([]*unstructured.Unstructured, []*unstructured.Unstructured) {
|
|
targetObjs := make([]*unstructured.Unstructured, 0)
|
|
hooks := make([]*unstructured.Unstructured, 0)
|
|
for _, obj := range target {
|
|
if obj == nil || ignore.Ignore(obj) {
|
|
continue
|
|
}
|
|
if hookutil.IsHook(obj) {
|
|
hooks = append(hooks, obj)
|
|
} else {
|
|
targetObjs = append(targetObjs, obj)
|
|
}
|
|
}
|
|
return targetObjs, hooks
|
|
}
|
|
|
|
// dedupLiveResources handles removes live resource duplicates with the same UID. Duplicates are created in a separate resource groups.
|
|
// E.g. apps/Deployment produces duplicate in extensions/Deployment, authorization.openshift.io/ClusterRole produces duplicate in rbac.authorization.k8s.io/ClusterRole etc.
|
|
// The method removes such duplicates unless it was defined in git ( exists in target resources list ). At least one duplicate stays.
|
|
// If non of duplicates are in git at random one stays
|
|
func dedupLiveResources(targetObjs []*unstructured.Unstructured, liveObjsByKey map[kubeutil.ResourceKey]*unstructured.Unstructured) {
|
|
targetObjByKey := make(map[kubeutil.ResourceKey]*unstructured.Unstructured)
|
|
for i := range targetObjs {
|
|
targetObjByKey[kubeutil.GetResourceKey(targetObjs[i])] = targetObjs[i]
|
|
}
|
|
liveObjsById := make(map[types.UID][]*unstructured.Unstructured)
|
|
for k := range liveObjsByKey {
|
|
obj := liveObjsByKey[k]
|
|
if obj != nil {
|
|
liveObjsById[obj.GetUID()] = append(liveObjsById[obj.GetUID()], obj)
|
|
}
|
|
}
|
|
for id := range liveObjsById {
|
|
objs := liveObjsById[id]
|
|
|
|
if len(objs) > 1 {
|
|
duplicatesLeft := len(objs)
|
|
for i := range objs {
|
|
obj := objs[i]
|
|
resourceKey := kubeutil.GetResourceKey(obj)
|
|
if _, ok := targetObjByKey[resourceKey]; !ok {
|
|
delete(liveObjsByKey, resourceKey)
|
|
duplicatesLeft--
|
|
if duplicatesLeft == 1 {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
type ReconciliationResult struct {
|
|
Live []*unstructured.Unstructured
|
|
Target []*unstructured.Unstructured
|
|
Hooks []*unstructured.Unstructured
|
|
}
|
|
|
|
func Reconcile(targetObjs []*unstructured.Unstructured, liveObjByKey map[kubeutil.ResourceKey]*unstructured.Unstructured, namespace string, resInfo kubeutil.ResourceInfoProvider) ReconciliationResult {
|
|
targetObjs, hooks := splitHooks(targetObjs)
|
|
dedupLiveResources(targetObjs, liveObjByKey)
|
|
|
|
managedLiveObj := make([]*unstructured.Unstructured, len(targetObjs))
|
|
for i, obj := range targetObjs {
|
|
gvk := obj.GroupVersionKind()
|
|
|
|
ns := text.FirstNonEmpty(obj.GetNamespace(), namespace)
|
|
|
|
namespaced, err := resInfo.IsNamespaced(gvk.GroupKind())
|
|
unknownScope := err != nil
|
|
|
|
var keysToCheck []kubeutil.ResourceKey
|
|
// If we get an error, we don't know whether the resource is namespaced. So we need to check for both in the
|
|
// live objects. If we don't check for both, then we risk missing the object and deleting it.
|
|
if namespaced || unknownScope {
|
|
keysToCheck = append(keysToCheck, kubeutil.NewResourceKey(gvk.Group, gvk.Kind, ns, obj.GetName()))
|
|
}
|
|
if !namespaced || unknownScope {
|
|
keysToCheck = append(keysToCheck, kubeutil.NewResourceKey(gvk.Group, gvk.Kind, "", obj.GetName()))
|
|
}
|
|
|
|
found := false
|
|
for _, key := range keysToCheck {
|
|
if liveObj, ok := liveObjByKey[key]; ok {
|
|
managedLiveObj[i] = liveObj
|
|
delete(liveObjByKey, key)
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
if !found {
|
|
managedLiveObj[i] = nil
|
|
}
|
|
}
|
|
|
|
for _, obj := range liveObjByKey {
|
|
targetObjs = append(targetObjs, nil)
|
|
managedLiveObj = append(managedLiveObj, obj)
|
|
}
|
|
return ReconciliationResult{
|
|
Target: targetObjs,
|
|
Hooks: hooks,
|
|
Live: managedLiveObj,
|
|
}
|
|
}
|