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]>
219 lines
8.6 KiB
Go
219 lines
8.6 KiB
Go
package utils
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
stderrors "errors"
|
|
"fmt"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"k8s.io/apimachinery/pkg/api/errors"
|
|
"k8s.io/apimachinery/pkg/api/resource"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
"k8s.io/apimachinery/pkg/conversion"
|
|
"k8s.io/apimachinery/pkg/fields"
|
|
"k8s.io/apimachinery/pkg/labels"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
|
|
|
|
argov1alpha1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/argo"
|
|
argodiff "github.com/hanzoai/deploy/util/argo/diff"
|
|
"github.com/hanzoai/deploy/util/argo/normalizers"
|
|
)
|
|
|
|
var appEquality = conversion.EqualitiesOrDie(
|
|
func(a, b resource.Quantity) bool {
|
|
// Ignore formatting, only care that numeric value stayed the same.
|
|
// TODO: if we decide it's important, it should be safe to start comparing the format.
|
|
//
|
|
// Uninitialized quantities are equivalent to 0 quantities.
|
|
return a.Cmp(b) == 0
|
|
},
|
|
func(a, b metav1.MicroTime) bool {
|
|
return a.UTC().Equal(b.UTC())
|
|
},
|
|
func(a, b metav1.Time) bool {
|
|
return a.UTC().Equal(b.UTC())
|
|
},
|
|
func(a, b labels.Selector) bool {
|
|
return a.String() == b.String()
|
|
},
|
|
func(a, b fields.Selector) bool {
|
|
return a.String() == b.String()
|
|
},
|
|
func(a, b argov1alpha1.ApplicationDestination) bool {
|
|
return a.Namespace == b.Namespace && a.Name == b.Name && a.Server == b.Server
|
|
},
|
|
)
|
|
|
|
// BuildIgnoreDiffConfig constructs a DiffConfig from the ApplicationSet's ignoreDifferences rules.
|
|
// Returns nil when ignoreDifferences is empty.
|
|
func BuildIgnoreDiffConfig(ignoreDifferences argov1alpha1.ApplicationSetIgnoreDifferences, ignoreNormalizerOpts normalizers.IgnoreNormalizerOpts) (argodiff.DiffConfig, error) {
|
|
if len(ignoreDifferences) == 0 {
|
|
return nil, nil
|
|
}
|
|
return argodiff.NewDiffConfigBuilder().
|
|
WithDiffSettings(ignoreDifferences.ToApplicationIgnoreDifferences(), nil, false, ignoreNormalizerOpts).
|
|
WithNoCache().
|
|
Build()
|
|
}
|
|
|
|
// CreateOrUpdate overrides "sigs.k8s.io/controller-runtime" function
|
|
// in sigs.k8s.io/controller-runtime/pkg/controller/controllerutil/controllerutil.go
|
|
// to add equality for argov1alpha1.ApplicationDestination
|
|
// argov1alpha1.ApplicationDestination has a private variable, so the default
|
|
// implementation fails to compare it.
|
|
//
|
|
// CreateOrUpdate creates or updates the given object in the Kubernetes
|
|
// cluster. The object's desired state must be reconciled with the existing
|
|
// state inside the passed in callback MutateFn.
|
|
//
|
|
// diffConfig must be built once per reconcile cycle via BuildIgnoreDiffConfig and may be nil
|
|
// when there are no ignoreDifferences rules. obj.Spec must already be normalized by the caller
|
|
// via NormalizeApplicationSpec before this function is called; the live object fetched from the
|
|
// cluster is normalized internally.
|
|
//
|
|
// The MutateFn is called regardless of creating or updating an object.
|
|
//
|
|
// It returns the executed operation and an error.
|
|
func CreateOrUpdate(ctx context.Context, logCtx *log.Entry, c client.Client, diffConfig argodiff.DiffConfig, obj *argov1alpha1.Application, f controllerutil.MutateFn) (controllerutil.OperationResult, error) {
|
|
key := client.ObjectKeyFromObject(obj)
|
|
if err := c.Get(ctx, key, obj); err != nil {
|
|
if !errors.IsNotFound(err) {
|
|
return controllerutil.OperationResultNone, err
|
|
}
|
|
if err := mutate(f, key, obj); err != nil {
|
|
return controllerutil.OperationResultNone, err
|
|
}
|
|
if err := c.Create(ctx, obj); err != nil {
|
|
return controllerutil.OperationResultNone, err
|
|
}
|
|
return controllerutil.OperationResultCreated, nil
|
|
}
|
|
|
|
normalizedLive := obj.DeepCopy()
|
|
|
|
// Mutate the live object to match the desired state.
|
|
if err := mutate(f, key, obj); err != nil {
|
|
return controllerutil.OperationResultNone, err
|
|
}
|
|
|
|
// Normalize the live spec to avoid spurious diffs from unimportant differences (e.g. nil vs
|
|
// empty SyncPolicy). obj.Spec is already normalized by the caller; only the live side needs it.
|
|
normalizedLive.Spec = *argo.NormalizeApplicationSpec(&normalizedLive.Spec)
|
|
|
|
// Apply ignoreApplicationDifferences rules to remove ignored fields from both the live and the desired state. This
|
|
// prevents those differences from appearing in the diff and therefore in the patch.
|
|
err := applyIgnoreDifferences(diffConfig, normalizedLive, obj)
|
|
if err != nil {
|
|
return controllerutil.OperationResultNone, fmt.Errorf("failed to apply ignore differences: %w", err)
|
|
}
|
|
|
|
// Note: if the informer cache holds a stale entry for an application that no longer exists on
|
|
// the API server, DeepEqual may match against that stale entry and we skip Patch here. The
|
|
// eviction in cacheSyncingClient only runs on NotFound from a write operation, so this edge
|
|
// case is not covered and relies on Kubernetes propagating the delete event to the informer.
|
|
if appEquality.DeepEqual(normalizedLive, obj) {
|
|
return controllerutil.OperationResultNone, nil
|
|
}
|
|
|
|
patch := client.MergeFrom(normalizedLive)
|
|
if log.IsLevelEnabled(log.DebugLevel) {
|
|
LogPatch(logCtx, patch, obj)
|
|
}
|
|
if err := c.Patch(ctx, obj, patch); err != nil {
|
|
return controllerutil.OperationResultNone, err
|
|
}
|
|
return controllerutil.OperationResultUpdated, nil
|
|
}
|
|
|
|
func LogPatch(logCtx *log.Entry, patch client.Patch, obj *argov1alpha1.Application) {
|
|
patchBytes, err := patch.Data(obj)
|
|
if err != nil {
|
|
logCtx.Errorf("failed to generate patch: %v", err)
|
|
}
|
|
// Get the patch as a plain object so it is easier to work with in json logs.
|
|
var patchObj map[string]any
|
|
err = json.Unmarshal(patchBytes, &patchObj)
|
|
if err != nil {
|
|
logCtx.Errorf("failed to unmarshal patch: %v", err)
|
|
}
|
|
logCtx.WithField("patch", patchObj).Debug("patching application")
|
|
}
|
|
|
|
// mutate wraps a MutateFn and applies validation to its result
|
|
func mutate(f controllerutil.MutateFn, key client.ObjectKey, obj client.Object) error {
|
|
if err := f(); err != nil {
|
|
return fmt.Errorf("error while wrapping using MutateFn: %w", err)
|
|
}
|
|
if newKey := client.ObjectKeyFromObject(obj); key != newKey {
|
|
return stderrors.New("MutateFn cannot mutate object name and/or object namespace")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// applyIgnoreDifferences applies the ignore differences rules to the found application. It modifies the applications in place.
|
|
// diffConfig may be nil, in which case this is a no-op.
|
|
func applyIgnoreDifferences(diffConfig argodiff.DiffConfig, found *argov1alpha1.Application, generatedApp *argov1alpha1.Application) error {
|
|
if diffConfig == nil {
|
|
return nil
|
|
}
|
|
|
|
generatedAppCopy := generatedApp.DeepCopy()
|
|
unstructuredFound, err := appToUnstructured(found)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to convert found application to unstructured: %w", err)
|
|
}
|
|
unstructuredGenerated, err := appToUnstructured(generatedApp)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to convert found application to unstructured: %w", err)
|
|
}
|
|
result, err := argodiff.Normalize([]*unstructured.Unstructured{unstructuredFound}, []*unstructured.Unstructured{unstructuredGenerated}, diffConfig)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to normalize application spec: %w", err)
|
|
}
|
|
if len(result.Lives) != 1 {
|
|
return fmt.Errorf("expected 1 normalized application, got %d", len(result.Lives))
|
|
}
|
|
foundJSONNormalized, err := json.Marshal(result.Lives[0].Object)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal normalized app to json: %w", err)
|
|
}
|
|
foundNormalized := &argov1alpha1.Application{}
|
|
err = json.Unmarshal(foundJSONNormalized, &foundNormalized)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to unmarshal normalized app to json: %w", err)
|
|
}
|
|
if len(result.Targets) != 1 {
|
|
return fmt.Errorf("expected 1 normalized application, got %d", len(result.Targets))
|
|
}
|
|
foundNormalized.DeepCopyInto(found)
|
|
generatedJSONNormalized, err := json.Marshal(result.Targets[0].Object)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal normalized app to json: %w", err)
|
|
}
|
|
generatedAppNormalized := &argov1alpha1.Application{}
|
|
err = json.Unmarshal(generatedJSONNormalized, &generatedAppNormalized)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to unmarshal normalized app json to structured app: %w", err)
|
|
}
|
|
generatedAppNormalized.DeepCopyInto(generatedApp)
|
|
// Prohibit jq queries from mutating silly things.
|
|
generatedApp.TypeMeta = generatedAppCopy.TypeMeta
|
|
generatedApp.Name = generatedAppCopy.Name
|
|
generatedApp.Namespace = generatedAppCopy.Namespace
|
|
generatedApp.Operation = generatedAppCopy.Operation
|
|
return nil
|
|
}
|
|
|
|
func appToUnstructured(app client.Object) (*unstructured.Unstructured, error) {
|
|
u, err := runtime.DefaultUnstructuredConverter.ToUnstructured(app)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to convert app object to unstructured: %w", err)
|
|
}
|
|
return &unstructured.Unstructured{Object: u}, nil
|
|
}
|