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]>
242 lines
6.5 KiB
Go
242 lines
6.5 KiB
Go
package normalizers
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/diff"
|
|
jsonpatch "github.com/evanphx/json-patch"
|
|
"github.com/itchyny/gojq"
|
|
log "github.com/sirupsen/logrus"
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/glob"
|
|
)
|
|
|
|
const (
|
|
// DefaultJQExecutionTimeout is the maximum time allowed for a JQ patch to execute
|
|
DefaultJQExecutionTimeout = 1 * time.Second
|
|
)
|
|
|
|
type normalizerPatch interface {
|
|
GetGroupKind() schema.GroupKind
|
|
GetNamespace() string
|
|
GetName() string
|
|
// Apply(un *unstructured.Unstructured) (error)
|
|
Apply(data []byte) ([]byte, error)
|
|
}
|
|
|
|
type baseNormalizerPatch struct {
|
|
groupKind schema.GroupKind
|
|
namespace string
|
|
name string
|
|
}
|
|
|
|
func (np *baseNormalizerPatch) GetGroupKind() schema.GroupKind {
|
|
return np.groupKind
|
|
}
|
|
|
|
func (np *baseNormalizerPatch) GetNamespace() string {
|
|
return np.namespace
|
|
}
|
|
|
|
func (np *baseNormalizerPatch) GetName() string {
|
|
return np.name
|
|
}
|
|
|
|
type jsonPatchNormalizerPatch struct {
|
|
baseNormalizerPatch
|
|
patch *jsonpatch.Patch
|
|
}
|
|
|
|
func (np *jsonPatchNormalizerPatch) Apply(data []byte) ([]byte, error) {
|
|
patchedData, err := np.patch.Apply(data)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return patchedData, nil
|
|
}
|
|
|
|
type jqNormalizerPatch struct {
|
|
baseNormalizerPatch
|
|
code *gojq.Code
|
|
jqExecutionTimeout time.Duration
|
|
}
|
|
|
|
func (np *jqNormalizerPatch) Apply(data []byte) ([]byte, error) {
|
|
dataJSON := make(map[string]any)
|
|
err := json.Unmarshal(data, &dataJSON)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
ctx, cancel := context.WithTimeout(context.Background(), np.jqExecutionTimeout)
|
|
defer cancel()
|
|
|
|
iter := np.code.RunWithContext(ctx, dataJSON)
|
|
first, ok := iter.Next()
|
|
if !ok {
|
|
return nil, errors.New("JQ patch did not return any data")
|
|
}
|
|
if err, ok = first.(error); ok {
|
|
if errors.Is(err, context.DeadlineExceeded) {
|
|
return nil, fmt.Errorf("JQ patch execution timed out (%v)", np.jqExecutionTimeout.String())
|
|
}
|
|
return nil, fmt.Errorf("JQ patch returned error: %w", err)
|
|
}
|
|
_, ok = iter.Next()
|
|
if ok {
|
|
return nil, errors.New("JQ patch returned multiple objects")
|
|
}
|
|
|
|
patchedData, err := json.Marshal(first)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return patchedData, err
|
|
}
|
|
|
|
type ignoreNormalizer struct {
|
|
patches []normalizerPatch
|
|
}
|
|
|
|
type IgnoreNormalizerOpts struct {
|
|
JQExecutionTimeout time.Duration
|
|
}
|
|
|
|
func (opts *IgnoreNormalizerOpts) getJQExecutionTimeout() time.Duration {
|
|
if opts == nil || opts.JQExecutionTimeout == 0 {
|
|
return DefaultJQExecutionTimeout
|
|
}
|
|
return opts.JQExecutionTimeout
|
|
}
|
|
|
|
// NewIgnoreNormalizer creates diff normalizer which removes ignored fields according to given application spec and resource overrides
|
|
func NewIgnoreNormalizer(ignore []v1alpha1.ResourceIgnoreDifferences, overrides map[string]v1alpha1.ResourceOverride, opts IgnoreNormalizerOpts) (diff.Normalizer, error) {
|
|
for key, override := range overrides {
|
|
group, kind, err := getGroupKindForOverrideKey(key)
|
|
if err != nil {
|
|
log.Warn(err)
|
|
}
|
|
if len(override.IgnoreDifferences.JSONPointers) > 0 || len(override.IgnoreDifferences.JQPathExpressions) > 0 {
|
|
resourceIgnoreDifference := v1alpha1.ResourceIgnoreDifferences{
|
|
Group: group,
|
|
Kind: kind,
|
|
}
|
|
if len(override.IgnoreDifferences.JSONPointers) > 0 {
|
|
resourceIgnoreDifference.JSONPointers = override.IgnoreDifferences.JSONPointers
|
|
}
|
|
if len(override.IgnoreDifferences.JQPathExpressions) > 0 {
|
|
resourceIgnoreDifference.JQPathExpressions = override.IgnoreDifferences.JQPathExpressions
|
|
}
|
|
ignore = append(ignore, resourceIgnoreDifference)
|
|
}
|
|
}
|
|
patches := make([]normalizerPatch, 0)
|
|
for i := range ignore {
|
|
for _, path := range ignore[i].JSONPointers {
|
|
patchData, err := json.Marshal([]map[string]string{{"op": "remove", "path": path}})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
patch, err := jsonpatch.DecodePatch(patchData)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
patches = append(patches, &jsonPatchNormalizerPatch{
|
|
baseNormalizerPatch: baseNormalizerPatch{
|
|
groupKind: schema.GroupKind{Group: ignore[i].Group, Kind: ignore[i].Kind},
|
|
name: ignore[i].Name,
|
|
namespace: ignore[i].Namespace,
|
|
},
|
|
patch: &patch,
|
|
})
|
|
}
|
|
for _, pathExpression := range ignore[i].JQPathExpressions {
|
|
jqDeletionQuery, err := gojq.Parse(fmt.Sprintf("del(%s)", pathExpression))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
jqDeletionCode, err := gojq.Compile(jqDeletionQuery)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
patches = append(patches, &jqNormalizerPatch{
|
|
baseNormalizerPatch: baseNormalizerPatch{
|
|
groupKind: schema.GroupKind{Group: ignore[i].Group, Kind: ignore[i].Kind},
|
|
name: ignore[i].Name,
|
|
namespace: ignore[i].Namespace,
|
|
},
|
|
code: jqDeletionCode,
|
|
jqExecutionTimeout: opts.getJQExecutionTimeout(),
|
|
})
|
|
}
|
|
}
|
|
return &ignoreNormalizer{patches: patches}, nil
|
|
}
|
|
|
|
// Normalize removes fields from supplied resource using json paths from matching items of specified resources ignored differences list
|
|
func (n *ignoreNormalizer) Normalize(un *unstructured.Unstructured) error {
|
|
if un == nil {
|
|
return errors.New("invalid argument: unstructured is nil")
|
|
}
|
|
matched := make([]normalizerPatch, 0)
|
|
for _, patch := range n.patches {
|
|
groupKind := un.GroupVersionKind().GroupKind()
|
|
|
|
if glob.Match(patch.GetGroupKind().Group, groupKind.Group) &&
|
|
glob.Match(patch.GetGroupKind().Kind, groupKind.Kind) &&
|
|
(patch.GetName() == "" || patch.GetName() == un.GetName()) &&
|
|
(patch.GetNamespace() == "" || patch.GetNamespace() == un.GetNamespace()) {
|
|
matched = append(matched, patch)
|
|
}
|
|
}
|
|
if len(matched) == 0 {
|
|
return nil
|
|
}
|
|
|
|
docData, err := json.Marshal(un)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, patch := range matched {
|
|
patchedDocData, err := patch.Apply(docData)
|
|
if err != nil {
|
|
if shouldLogError(err) {
|
|
gvk := un.GroupVersionKind()
|
|
log.WithFields(log.Fields{
|
|
"group": gvk.Group,
|
|
"kind": gvk.Kind,
|
|
"name": un.GetName(),
|
|
"namespace": un.GetNamespace(),
|
|
}).Debugf("Failed to apply normalization patch: %v", err)
|
|
}
|
|
continue
|
|
}
|
|
docData = patchedDocData
|
|
}
|
|
|
|
err = json.Unmarshal(docData, un)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func shouldLogError(e error) bool {
|
|
if strings.Contains(e.Error(), "Unable to remove nonexistent key") {
|
|
return false
|
|
}
|
|
if strings.Contains(e.Error(), "remove operation does not apply: doc is missing path") {
|
|
return false
|
|
}
|
|
return true
|
|
}
|