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]>
330 lines
10 KiB
Go
330 lines
10 KiB
Go
package normalizers
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
"sigs.k8s.io/yaml"
|
|
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/test"
|
|
)
|
|
|
|
func TestNormalizeObjectWithMatchedGroupKind(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{{
|
|
Group: "apps",
|
|
Kind: "Deployment",
|
|
JSONPointers: []string{"/not-matching-path", "/spec/template/spec/containers"},
|
|
}}, make(map[string]v1alpha1.ResourceOverride), IgnoreNormalizerOpts{})
|
|
|
|
require.NoError(t, err)
|
|
|
|
deployment := test.NewDeployment()
|
|
|
|
_, has, err := unstructured.NestedSlice(deployment.Object, "spec", "template", "spec", "containers")
|
|
require.NoError(t, err)
|
|
assert.True(t, has)
|
|
|
|
err = normalizer.Normalize(deployment)
|
|
require.NoError(t, err)
|
|
_, has, err = unstructured.NestedSlice(deployment.Object, "spec", "template", "spec", "containers")
|
|
require.NoError(t, err)
|
|
assert.False(t, has)
|
|
|
|
err = normalizer.Normalize(nil)
|
|
require.Error(t, err)
|
|
}
|
|
|
|
func TestNormalizeNoMatchedGroupKinds(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{{
|
|
Group: "",
|
|
Kind: "Service",
|
|
JSONPointers: []string{"/spec"},
|
|
}}, make(map[string]v1alpha1.ResourceOverride), IgnoreNormalizerOpts{})
|
|
|
|
require.NoError(t, err)
|
|
|
|
deployment := test.NewDeployment()
|
|
|
|
err = normalizer.Normalize(deployment)
|
|
require.NoError(t, err)
|
|
|
|
_, hasSpec, err := unstructured.NestedMap(deployment.Object, "spec")
|
|
require.NoError(t, err)
|
|
assert.True(t, hasSpec)
|
|
}
|
|
|
|
func TestNormalizeMatchedResourceOverrides(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{}, map[string]v1alpha1.ResourceOverride{
|
|
"apps/Deployment": {
|
|
IgnoreDifferences: v1alpha1.OverrideIgnoreDiff{JSONPointers: []string{"/spec/template/spec/containers"}},
|
|
},
|
|
}, IgnoreNormalizerOpts{})
|
|
|
|
require.NoError(t, err)
|
|
|
|
deployment := test.NewDeployment()
|
|
|
|
_, has, err := unstructured.NestedSlice(deployment.Object, "spec", "template", "spec", "containers")
|
|
require.NoError(t, err)
|
|
assert.True(t, has)
|
|
|
|
err = normalizer.Normalize(deployment)
|
|
require.NoError(t, err)
|
|
_, has, err = unstructured.NestedSlice(deployment.Object, "spec", "template", "spec", "containers")
|
|
require.NoError(t, err)
|
|
assert.False(t, has)
|
|
}
|
|
|
|
const testCRDYAML = `
|
|
apiVersion: apiextensions.k8s.io/v1
|
|
kind: CustomResourceDefinition
|
|
metadata:
|
|
name: certificates.cert-manager.io
|
|
spec:
|
|
conversion:
|
|
strategy: None
|
|
group: cert-manager.io
|
|
names:
|
|
kind: Certificate
|
|
listKind: CertificateList
|
|
plural: certificates
|
|
shortNames:
|
|
- cert
|
|
- certs
|
|
singular: certificate
|
|
scope: Namespaced
|
|
version: v1alpha1
|
|
versions:
|
|
- name: v1alpha1
|
|
served: true
|
|
storage: true
|
|
schema:
|
|
openAPIV3Schema:
|
|
type: object
|
|
properties:
|
|
json:
|
|
x-kubernetes-preserve-unknown-fields: true`
|
|
|
|
func TestNormalizeMissingJsonPointer(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{}, map[string]v1alpha1.ResourceOverride{
|
|
"apps/Deployment": {
|
|
IgnoreDifferences: v1alpha1.OverrideIgnoreDiff{JSONPointers: []string{"/garbage"}},
|
|
},
|
|
"apiextensions.k8s.io/CustomResourceDefinition": {
|
|
IgnoreDifferences: v1alpha1.OverrideIgnoreDiff{JSONPointers: []string{"/spec/additionalPrinterColumns/0/priority"}},
|
|
},
|
|
}, IgnoreNormalizerOpts{})
|
|
require.NoError(t, err)
|
|
|
|
deployment := test.NewDeployment()
|
|
|
|
err = normalizer.Normalize(deployment)
|
|
require.NoError(t, err)
|
|
|
|
crd := unstructured.Unstructured{}
|
|
err = yaml.Unmarshal([]byte(testCRDYAML), &crd)
|
|
require.NoError(t, err)
|
|
|
|
err = normalizer.Normalize(&crd)
|
|
require.NoError(t, err)
|
|
}
|
|
|
|
func TestNormalizeGlobMatch(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{}, map[string]v1alpha1.ResourceOverride{
|
|
"*/*": {
|
|
IgnoreDifferences: v1alpha1.OverrideIgnoreDiff{JSONPointers: []string{"/spec/template/spec/containers"}},
|
|
},
|
|
}, IgnoreNormalizerOpts{})
|
|
|
|
require.NoError(t, err)
|
|
|
|
deployment := test.NewDeployment()
|
|
|
|
_, has, err := unstructured.NestedSlice(deployment.Object, "spec", "template", "spec", "containers")
|
|
require.NoError(t, err)
|
|
assert.True(t, has)
|
|
|
|
err = normalizer.Normalize(deployment)
|
|
require.NoError(t, err)
|
|
_, has, err = unstructured.NestedSlice(deployment.Object, "spec", "template", "spec", "containers")
|
|
require.NoError(t, err)
|
|
assert.False(t, has)
|
|
}
|
|
|
|
func TestNormalizeJQPathExpression(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{{
|
|
Group: "apps",
|
|
Kind: "Deployment",
|
|
JQPathExpressions: []string{".spec.template.spec.initContainers[] | select(.name == \"init-container-0\")"},
|
|
}}, make(map[string]v1alpha1.ResourceOverride), IgnoreNormalizerOpts{})
|
|
|
|
require.NoError(t, err)
|
|
|
|
deployment := test.NewDeployment()
|
|
|
|
var initContainers []any
|
|
initContainers = append(initContainers, map[string]any{"name": "init-container-0"})
|
|
initContainers = append(initContainers, map[string]any{"name": "init-container-1"})
|
|
err = unstructured.SetNestedSlice(deployment.Object, initContainers, "spec", "template", "spec", "initContainers")
|
|
require.NoError(t, err)
|
|
|
|
actualInitContainers, has, err := unstructured.NestedSlice(deployment.Object, "spec", "template", "spec", "initContainers")
|
|
require.NoError(t, err)
|
|
assert.True(t, has)
|
|
assert.Len(t, actualInitContainers, 2)
|
|
|
|
err = normalizer.Normalize(deployment)
|
|
require.NoError(t, err)
|
|
actualInitContainers, has, err = unstructured.NestedSlice(deployment.Object, "spec", "template", "spec", "initContainers")
|
|
require.NoError(t, err)
|
|
assert.True(t, has)
|
|
assert.Len(t, actualInitContainers, 1)
|
|
|
|
actualInitContainerName, has, err := unstructured.NestedString(actualInitContainers[0].(map[string]any), "name")
|
|
require.NoError(t, err)
|
|
assert.True(t, has)
|
|
assert.Equal(t, "init-container-1", actualInitContainerName)
|
|
}
|
|
|
|
func TestNormalizeIllegalJQPathExpression(t *testing.T) {
|
|
t.Parallel()
|
|
_, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{{
|
|
Group: "apps",
|
|
Kind: "Deployment",
|
|
JQPathExpressions: []string{".spec.template.spec.containers[] | select(.name == \"missing-quote)"},
|
|
// JSONPointers: []string{"no-starting-slash"},
|
|
}}, make(map[string]v1alpha1.ResourceOverride), IgnoreNormalizerOpts{})
|
|
|
|
require.Error(t, err)
|
|
}
|
|
|
|
func TestNormalizeJQPathExpressionWithError(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{{
|
|
Group: "apps",
|
|
Kind: "Deployment",
|
|
JQPathExpressions: []string{".spec.fakeField.foo[]"},
|
|
}}, make(map[string]v1alpha1.ResourceOverride), IgnoreNormalizerOpts{})
|
|
|
|
require.NoError(t, err)
|
|
|
|
deployment := test.NewDeployment()
|
|
originalDeployment, err := deployment.MarshalJSON()
|
|
require.NoError(t, err)
|
|
|
|
err = normalizer.Normalize(deployment)
|
|
require.NoError(t, err)
|
|
|
|
normalizedDeployment, err := deployment.MarshalJSON()
|
|
require.NoError(t, err)
|
|
assert.Equal(t, originalDeployment, normalizedDeployment)
|
|
}
|
|
|
|
func TestNormalizeExpectedErrorAreSilenced(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{}, map[string]v1alpha1.ResourceOverride{
|
|
"*/*": {
|
|
IgnoreDifferences: v1alpha1.OverrideIgnoreDiff{
|
|
JSONPointers: []string{"/invalid", "/invalid/json/path"},
|
|
},
|
|
},
|
|
}, IgnoreNormalizerOpts{})
|
|
require.NoError(t, err)
|
|
|
|
ignoreNormalizer := normalizer.(*ignoreNormalizer)
|
|
assert.Len(t, ignoreNormalizer.patches, 2)
|
|
jsonPatch := ignoreNormalizer.patches[0]
|
|
jqPatch := ignoreNormalizer.patches[1]
|
|
|
|
deployment := test.NewDeployment()
|
|
deploymentData, err := json.Marshal(deployment)
|
|
require.NoError(t, err)
|
|
|
|
// Error: "error in remove for path: '/invalid': Unable to remove nonexistent key: invalid: missing value"
|
|
_, err = jsonPatch.Apply(deploymentData)
|
|
assert.False(t, shouldLogError(err))
|
|
|
|
// Error: "remove operation does not apply: doc is missing path: \"/invalid/json/path\": missing value"
|
|
_, err = jqPatch.Apply(deploymentData)
|
|
assert.False(t, shouldLogError(err))
|
|
|
|
assert.True(t, shouldLogError(errors.New("An error that should not be ignored")))
|
|
}
|
|
|
|
func TestJqPathExpressionFailWithTimeout(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{}, map[string]v1alpha1.ResourceOverride{
|
|
"*/*": {
|
|
IgnoreDifferences: v1alpha1.OverrideIgnoreDiff{
|
|
JQPathExpressions: []string{"until(true==false; [.] + [1])"},
|
|
},
|
|
},
|
|
}, IgnoreNormalizerOpts{})
|
|
require.NoError(t, err)
|
|
|
|
ignoreNormalizer := normalizer.(*ignoreNormalizer)
|
|
assert.Len(t, ignoreNormalizer.patches, 1)
|
|
jqPatch := ignoreNormalizer.patches[0]
|
|
|
|
deployment := test.NewDeployment()
|
|
deploymentData, err := json.Marshal(deployment)
|
|
require.NoError(t, err)
|
|
|
|
_, err = jqPatch.Apply(deploymentData)
|
|
assert.ErrorContains(t, err, "JQ patch execution timed out")
|
|
}
|
|
|
|
func TestJQPathExpressionReturnsHelpfulError(t *testing.T) {
|
|
t.Parallel()
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{{
|
|
Kind: "ConfigMap",
|
|
// This is a really wild expression, but it does trigger the desired error.
|
|
JQPathExpressions: []string{`.nothing) | .data["config.yaml"] |= (fromjson | del(.auth) | tojson`},
|
|
}}, nil, IgnoreNormalizerOpts{})
|
|
|
|
require.NoError(t, err)
|
|
|
|
configMap := test.NewConfigMap()
|
|
require.NoError(t, err)
|
|
|
|
out := test.CaptureLogEntries(func() {
|
|
err = normalizer.Normalize(configMap)
|
|
require.NoError(t, err)
|
|
})
|
|
assert.Contains(t, out, "fromjson cannot be applied")
|
|
}
|
|
|
|
func TestNormalizeFailureLogIncludesResourceContext(t *testing.T) {
|
|
t.Parallel()
|
|
// When a normalization patch fails with a non-silenced error, the log entry
|
|
// must identify which resource was being normalized so operators can act on it.
|
|
// Regression test for https://github.com/argoproj/argo-cd/issues/14148.
|
|
normalizer, err := NewIgnoreNormalizer([]v1alpha1.ResourceIgnoreDifferences{{
|
|
Kind: "ConfigMap",
|
|
JQPathExpressions: []string{`.nothing) | .data["config.yaml"] |= (fromjson | del(.auth) | tojson`},
|
|
}}, nil, IgnoreNormalizerOpts{})
|
|
require.NoError(t, err)
|
|
|
|
configMap := test.NewConfigMap()
|
|
|
|
out := test.CaptureLogEntries(func() {
|
|
err = normalizer.Normalize(configMap)
|
|
require.NoError(t, err)
|
|
})
|
|
|
|
assert.Contains(t, out, "Failed to apply normalization patch")
|
|
assert.Contains(t, out, "kind=ConfigMap")
|
|
assert.Contains(t, out, "name=my-configmap")
|
|
}
|