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]>
333 lines
11 KiB
Go
333 lines
11 KiB
Go
package diff_test
|
|
|
|
import (
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
"github.com/sirupsen/logrus/hooks/test"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
testutil "github.com/hanzoai/deploy/test"
|
|
argo "github.com/hanzoai/deploy/util/argo/diff"
|
|
"github.com/hanzoai/deploy/util/argo/normalizers"
|
|
"github.com/hanzoai/deploy/util/argo/testdata"
|
|
cacheutil "github.com/hanzoai/deploy/util/cache"
|
|
appstatecache "github.com/hanzoai/deploy/util/cache/appstate"
|
|
)
|
|
|
|
func TestStateDiff(t *testing.T) {
|
|
t.Parallel()
|
|
type diffConfigParams struct {
|
|
ignores []v1alpha1.ResourceIgnoreDifferences
|
|
overrides map[string]v1alpha1.ResourceOverride
|
|
label string
|
|
trackingMethod string
|
|
ignoreRoles bool
|
|
}
|
|
defaultDiffConfigParams := func() *diffConfigParams {
|
|
return &diffConfigParams{
|
|
ignores: []v1alpha1.ResourceIgnoreDifferences{},
|
|
overrides: map[string]v1alpha1.ResourceOverride{},
|
|
label: "",
|
|
trackingMethod: "",
|
|
ignoreRoles: true,
|
|
}
|
|
}
|
|
diffConfig := func(t *testing.T, params *diffConfigParams) argo.DiffConfig {
|
|
t.Helper()
|
|
diffConfig, err := argo.NewDiffConfigBuilder().
|
|
WithDiffSettings(params.ignores, params.overrides, params.ignoreRoles, normalizers.IgnoreNormalizerOpts{}).
|
|
WithTracking(params.label, params.trackingMethod).
|
|
WithNoCache().
|
|
Build()
|
|
require.NoError(t, err)
|
|
return diffConfig
|
|
}
|
|
type testcase struct {
|
|
name string
|
|
params func() *diffConfigParams
|
|
desiredState *unstructured.Unstructured
|
|
liveState *unstructured.Unstructured
|
|
expectedNormalizedReplicas int
|
|
expectedPredictedReplicas int
|
|
}
|
|
testcases := []*testcase{
|
|
{
|
|
name: "will normalize replica field if owned by trusted manager",
|
|
params: func() *diffConfigParams {
|
|
params := defaultDiffConfigParams()
|
|
params.ignores = []v1alpha1.ResourceIgnoreDifferences{
|
|
{
|
|
Group: "*",
|
|
Kind: "*",
|
|
ManagedFieldsManagers: []string{"kube-controller-manager"},
|
|
},
|
|
}
|
|
return params
|
|
},
|
|
desiredState: testutil.YamlToUnstructured(testdata.DesiredDeploymentYaml),
|
|
liveState: testutil.YamlToUnstructured(testdata.LiveDeploymentWithManagedReplicaYaml),
|
|
expectedNormalizedReplicas: 1,
|
|
expectedPredictedReplicas: 1,
|
|
},
|
|
{
|
|
name: "will keep replica field not owned by trusted manager",
|
|
params: func() *diffConfigParams {
|
|
params := defaultDiffConfigParams()
|
|
params.ignores = []v1alpha1.ResourceIgnoreDifferences{
|
|
{
|
|
Group: "*",
|
|
Kind: "*",
|
|
ManagedFieldsManagers: []string{"some-other-manager"},
|
|
},
|
|
}
|
|
return params
|
|
},
|
|
desiredState: testutil.YamlToUnstructured(testdata.DesiredDeploymentYaml),
|
|
liveState: testutil.YamlToUnstructured(testdata.LiveDeploymentWithManagedReplicaYaml),
|
|
expectedNormalizedReplicas: 2,
|
|
expectedPredictedReplicas: 3,
|
|
},
|
|
{
|
|
name: "will normalize replica field if configured with json pointers",
|
|
params: func() *diffConfigParams {
|
|
params := defaultDiffConfigParams()
|
|
params.ignores = []v1alpha1.ResourceIgnoreDifferences{
|
|
{
|
|
Group: "*",
|
|
Kind: "*",
|
|
JSONPointers: []string{"/spec/replicas"},
|
|
},
|
|
}
|
|
return params
|
|
},
|
|
desiredState: testutil.YamlToUnstructured(testdata.DesiredDeploymentYaml),
|
|
liveState: testutil.YamlToUnstructured(testdata.LiveDeploymentWithManagedReplicaYaml),
|
|
expectedNormalizedReplicas: 1,
|
|
expectedPredictedReplicas: 1,
|
|
},
|
|
{
|
|
name: "will normalize replica field if configured with jq expression",
|
|
params: func() *diffConfigParams {
|
|
params := defaultDiffConfigParams()
|
|
params.ignores = []v1alpha1.ResourceIgnoreDifferences{
|
|
{
|
|
Group: "*",
|
|
Kind: "*",
|
|
JQPathExpressions: []string{".spec.replicas"},
|
|
},
|
|
}
|
|
return params
|
|
},
|
|
desiredState: testutil.YamlToUnstructured(testdata.DesiredDeploymentYaml),
|
|
liveState: testutil.YamlToUnstructured(testdata.LiveDeploymentWithManagedReplicaYaml),
|
|
expectedNormalizedReplicas: 1,
|
|
expectedPredictedReplicas: 1,
|
|
},
|
|
}
|
|
for _, tc := range testcases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
// given
|
|
t.Parallel()
|
|
dc := diffConfig(t, tc.params())
|
|
|
|
// when
|
|
result, err := argo.StateDiff(t.Context(), tc.liveState, tc.desiredState, dc)
|
|
|
|
// then
|
|
require.NoError(t, err)
|
|
assert.NotNil(t, result)
|
|
assert.True(t, result.Modified)
|
|
normalized := testutil.YamlToUnstructured(string(result.NormalizedLive))
|
|
replicas, found, err := unstructured.NestedFloat64(normalized.Object, "spec", "replicas")
|
|
require.NoError(t, err)
|
|
assert.True(t, found)
|
|
assert.InEpsilon(t, float64(tc.expectedNormalizedReplicas), replicas, 0.0001)
|
|
predicted := testutil.YamlToUnstructured(string(result.PredictedLive))
|
|
predictedReplicas, found, err := unstructured.NestedFloat64(predicted.Object, "spec", "replicas")
|
|
require.NoError(t, err)
|
|
assert.True(t, found)
|
|
assert.InEpsilon(t, float64(tc.expectedPredictedReplicas), predictedReplicas, 0.0001)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDiffConfigBuilder(t *testing.T) {
|
|
t.Parallel()
|
|
type fixture struct {
|
|
ignores []v1alpha1.ResourceIgnoreDifferences
|
|
overrides map[string]v1alpha1.ResourceOverride
|
|
label string
|
|
trackingMethod string
|
|
noCache bool
|
|
ignoreRoles bool
|
|
appName string
|
|
}
|
|
setup := func() *fixture {
|
|
return &fixture{
|
|
ignores: []v1alpha1.ResourceIgnoreDifferences{},
|
|
overrides: make(map[string]v1alpha1.ResourceOverride),
|
|
label: "some-label",
|
|
trackingMethod: "tracking-method",
|
|
noCache: true,
|
|
ignoreRoles: false,
|
|
appName: "application-name",
|
|
}
|
|
}
|
|
t.Run("will build diff config successfully", func(t *testing.T) {
|
|
// given
|
|
t.Parallel()
|
|
f := setup()
|
|
|
|
// when
|
|
diffConfig, err := argo.NewDiffConfigBuilder().
|
|
WithDiffSettings(f.ignores, f.overrides, f.ignoreRoles, normalizers.IgnoreNormalizerOpts{}).
|
|
WithTracking(f.label, f.trackingMethod).
|
|
WithNoCache().
|
|
Build()
|
|
|
|
// then
|
|
require.NoError(t, err)
|
|
require.NotNil(t, diffConfig)
|
|
assert.Empty(t, diffConfig.Ignores())
|
|
assert.Empty(t, diffConfig.Overrides())
|
|
assert.Equal(t, f.label, diffConfig.AppLabelKey())
|
|
assert.Equal(t, f.overrides, diffConfig.Overrides())
|
|
assert.Equal(t, f.trackingMethod, diffConfig.TrackingMethod())
|
|
assert.Equal(t, f.noCache, diffConfig.NoCache())
|
|
assert.Equal(t, f.ignoreRoles, diffConfig.IgnoreAggregatedRoles())
|
|
assert.Empty(t, diffConfig.AppName())
|
|
assert.Nil(t, diffConfig.StateCache())
|
|
})
|
|
t.Run("will initialize ignore differences if nil is passed", func(t *testing.T) {
|
|
// given
|
|
t.Parallel()
|
|
f := setup()
|
|
|
|
// when
|
|
diffConfig, err := argo.NewDiffConfigBuilder().
|
|
WithDiffSettings(nil, nil, f.ignoreRoles, normalizers.IgnoreNormalizerOpts{}).
|
|
WithTracking(f.label, f.trackingMethod).
|
|
WithNoCache().
|
|
Build()
|
|
|
|
// then
|
|
require.NoError(t, err)
|
|
require.NotNil(t, diffConfig)
|
|
assert.Empty(t, diffConfig.Ignores())
|
|
assert.Empty(t, diffConfig.Overrides())
|
|
assert.Equal(t, f.label, diffConfig.AppLabelKey())
|
|
assert.Equal(t, f.overrides, diffConfig.Overrides())
|
|
assert.Equal(t, f.trackingMethod, diffConfig.TrackingMethod())
|
|
assert.Equal(t, f.noCache, diffConfig.NoCache())
|
|
assert.Equal(t, f.ignoreRoles, diffConfig.IgnoreAggregatedRoles())
|
|
})
|
|
t.Run("will return error if retrieving diff from cache an no appName configured", func(t *testing.T) {
|
|
// given
|
|
t.Parallel()
|
|
f := setup()
|
|
|
|
// when
|
|
diffConfig, err := argo.NewDiffConfigBuilder().
|
|
WithDiffSettings(f.ignores, f.overrides, f.ignoreRoles, normalizers.IgnoreNormalizerOpts{}).
|
|
WithTracking(f.label, f.trackingMethod).
|
|
WithCache(&appstatecache.Cache{}, "").
|
|
Build()
|
|
|
|
// then
|
|
require.Error(t, err)
|
|
require.Nil(t, diffConfig)
|
|
})
|
|
t.Run("will return error if retrieving diff from cache and no stateCache configured", func(t *testing.T) {
|
|
// given
|
|
t.Parallel()
|
|
f := setup()
|
|
|
|
// when
|
|
diffConfig, err := argo.NewDiffConfigBuilder().
|
|
WithDiffSettings(f.ignores, f.overrides, f.ignoreRoles, normalizers.IgnoreNormalizerOpts{}).
|
|
WithTracking(f.label, f.trackingMethod).
|
|
WithCache(nil, f.appName).
|
|
Build()
|
|
|
|
// then
|
|
require.Error(t, err)
|
|
require.Nil(t, diffConfig)
|
|
})
|
|
}
|
|
|
|
func TestDiffFromCache(t *testing.T) {
|
|
t.Run("returns false and logs warning on cache miss", func(t *testing.T) {
|
|
// given
|
|
hook := test.NewLocal(logrus.StandardLogger())
|
|
defer hook.Reset()
|
|
|
|
// Real in-memory cache with no data stored → triggers ErrCacheMiss
|
|
cache := appstatecache.NewCache(cacheutil.NewCache(cacheutil.NewInMemoryCache(0)), 0)
|
|
|
|
diffConfig, err := argo.NewDiffConfigBuilder().
|
|
WithDiffSettings([]v1alpha1.ResourceIgnoreDifferences{}, map[string]v1alpha1.ResourceOverride{}, false, normalizers.IgnoreNormalizerOpts{}).
|
|
WithTracking("", "").
|
|
WithCache(cache, "application-name").
|
|
Build()
|
|
require.NoError(t, err)
|
|
|
|
// when
|
|
found, cachedDiff := diffConfig.DiffFromCache("application-name")
|
|
|
|
// then
|
|
assert.False(t, found)
|
|
assert.Nil(t, cachedDiff)
|
|
require.Len(t, hook.Entries, 1)
|
|
assert.Equal(t, logrus.WarnLevel, hook.LastEntry().Level)
|
|
assert.Contains(t, hook.LastEntry().Message, "cannot get managed resources for app application-name")
|
|
assert.Contains(t, hook.LastEntry().Message, appstatecache.ErrCacheMiss.Error())
|
|
})
|
|
|
|
t.Run("returns false and logs error on cache failure", func(t *testing.T) {
|
|
// given
|
|
hook := test.NewLocal(logrus.StandardLogger())
|
|
defer hook.Reset()
|
|
|
|
errCache := errors.New("cache unavailable")
|
|
// Custom cache client that always returns the given error on Get
|
|
failClient := &failingCacheClient{
|
|
InMemoryCache: cacheutil.NewInMemoryCache(0),
|
|
err: errCache,
|
|
}
|
|
cache := appstatecache.NewCache(cacheutil.NewCache(failClient), 0)
|
|
|
|
diffConfig, err := argo.NewDiffConfigBuilder().
|
|
WithDiffSettings([]v1alpha1.ResourceIgnoreDifferences{}, map[string]v1alpha1.ResourceOverride{}, false, normalizers.IgnoreNormalizerOpts{}).
|
|
WithTracking("", "").
|
|
WithCache(cache, "application-name").
|
|
Build()
|
|
require.NoError(t, err)
|
|
|
|
// when
|
|
found, cachedDiff := diffConfig.DiffFromCache("application-name")
|
|
|
|
// then
|
|
assert.False(t, found)
|
|
assert.Nil(t, cachedDiff)
|
|
require.Len(t, hook.Entries, 1)
|
|
assert.Equal(t, logrus.ErrorLevel, hook.LastEntry().Level)
|
|
assert.Contains(t, hook.LastEntry().Message, "cannot get managed resources for app application-name")
|
|
assert.Contains(t, hook.LastEntry().Message, errCache.Error())
|
|
})
|
|
}
|
|
|
|
// failingCacheClient embeds InMemoryCache and overrides Get to always return a custom error.
|
|
type failingCacheClient struct {
|
|
*cacheutil.InMemoryCache
|
|
err error
|
|
}
|
|
|
|
func (f *failingCacheClient) Get(_ string, _ any) error {
|
|
return f.err
|
|
}
|