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]>
201 lines
6.2 KiB
Go
201 lines
6.2 KiB
Go
package admin
|
|
|
|
import (
|
|
"testing"
|
|
|
|
clustermocks "github.com/hanzoai/deploy/gitops-engine/pkg/cache/mocks"
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/health"
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/utils/kube"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/mock"
|
|
"github.com/stretchr/testify/require"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
kubefake "k8s.io/client-go/kubernetes/fake"
|
|
"k8s.io/client-go/tools/cache"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
statecache "github.com/hanzoai/deploy/controller/cache"
|
|
cachemocks "github.com/hanzoai/deploy/controller/cache/mocks"
|
|
"github.com/hanzoai/deploy/controller/metrics"
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
appfake "github.com/hanzoai/deploy/pkg/client/clientset/versioned/fake"
|
|
argocdclient "github.com/hanzoai/deploy/reposerver/apiclient"
|
|
"github.com/hanzoai/deploy/reposerver/apiclient/mocks"
|
|
"github.com/hanzoai/deploy/test"
|
|
"github.com/hanzoai/deploy/util/argo/normalizers"
|
|
"github.com/hanzoai/deploy/util/db"
|
|
"github.com/hanzoai/deploy/util/settings"
|
|
)
|
|
|
|
func TestGetReconcileResults(t *testing.T) {
|
|
ctx := t.Context()
|
|
|
|
appClientset := appfake.NewSimpleClientset(&v1alpha1.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "test",
|
|
Namespace: "default",
|
|
},
|
|
Status: v1alpha1.ApplicationStatus{
|
|
Health: v1alpha1.AppHealthStatus{Status: health.HealthStatusHealthy},
|
|
Sync: v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
|
|
},
|
|
})
|
|
|
|
result, err := getReconcileResults(ctx, appClientset, "default", "")
|
|
require.NoError(t, err)
|
|
|
|
expectedResults := []appReconcileResult{{
|
|
Name: "test",
|
|
Health: health.HealthStatusHealthy,
|
|
Sync: &v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
|
|
}}
|
|
assert.ElementsMatch(t, expectedResults, result)
|
|
}
|
|
|
|
func TestGetReconcileResults_Refresh(t *testing.T) {
|
|
ctx := t.Context()
|
|
|
|
argoCM := &corev1.ConfigMap{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: common.ArgoCDConfigMapName,
|
|
Namespace: "default",
|
|
Labels: map[string]string{
|
|
"app.kubernetes.io/part-of": "argocd",
|
|
},
|
|
},
|
|
}
|
|
argoCDSecret := &corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: common.ArgoCDSecretName,
|
|
Namespace: "default",
|
|
Labels: map[string]string{
|
|
"app.kubernetes.io/part-of": "argocd",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"admin.password": nil,
|
|
"server.secretkey": nil,
|
|
},
|
|
}
|
|
proj := &v1alpha1.AppProject{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "default",
|
|
Namespace: "default",
|
|
},
|
|
Spec: v1alpha1.AppProjectSpec{Destinations: []v1alpha1.ApplicationDestination{{Namespace: "*", Server: "*"}}},
|
|
}
|
|
|
|
app := &v1alpha1.Application{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "test",
|
|
Namespace: "default",
|
|
},
|
|
Spec: v1alpha1.ApplicationSpec{
|
|
Source: &v1alpha1.ApplicationSource{},
|
|
Project: "default",
|
|
Destination: v1alpha1.ApplicationDestination{
|
|
Server: v1alpha1.KubernetesInternalAPIServerAddr,
|
|
Namespace: "default",
|
|
},
|
|
},
|
|
}
|
|
|
|
appClientset := appfake.NewSimpleClientset(app, proj)
|
|
deployment := test.NewDeployment()
|
|
kubeClientset := kubefake.NewClientset(deployment, argoCM, argoCDSecret)
|
|
clusterCache := &clustermocks.ClusterCache{}
|
|
clusterCache.EXPECT().IsNamespaced(mock.Anything).Return(true, nil)
|
|
clusterCache.EXPECT().GetGVKParser().Return(nil)
|
|
repoServerClient := &mocks.RepoServerServiceClient{}
|
|
repoServerClient.EXPECT().GenerateManifest(mock.Anything, mock.Anything).Return(&argocdclient.ManifestResponse{
|
|
Manifests: []string{test.DeploymentManifest},
|
|
}, nil)
|
|
repoServerClientset := &mocks.Clientset{RepoServerServiceClient: repoServerClient}
|
|
liveStateCache := &cachemocks.LiveStateCache{}
|
|
liveStateCache.EXPECT().GetManagedLiveObjs(mock.Anything, mock.Anything, mock.Anything).Return(map[kube.ResourceKey]*unstructured.Unstructured{
|
|
kube.GetResourceKey(deployment): deployment,
|
|
}, nil)
|
|
liveStateCache.EXPECT().GetVersionsInfo(mock.Anything).Return("v1.2.3", nil, nil)
|
|
liveStateCache.EXPECT().Init().Return(nil)
|
|
liveStateCache.EXPECT().GetClusterCache(mock.Anything).Return(clusterCache, nil)
|
|
liveStateCache.EXPECT().IsNamespaced(mock.Anything, mock.Anything).Return(true, nil)
|
|
|
|
result, err := reconcileApplications(ctx, kubeClientset, appClientset, "default", repoServerClientset, "",
|
|
func(_ db.ArgoDB, _ cache.SharedIndexInformer, _ *settings.SettingsManager, _ *metrics.MetricsServer) statecache.LiveStateCache {
|
|
return liveStateCache
|
|
},
|
|
false,
|
|
normalizers.IgnoreNormalizerOpts{},
|
|
)
|
|
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, health.HealthStatusMissing, result[0].Health)
|
|
assert.Equal(t, v1alpha1.SyncStatusCodeOutOfSync, result[0].Sync.Status)
|
|
}
|
|
|
|
func TestDiffReconcileResults_NoDifferences(t *testing.T) {
|
|
logs, err := captureStdout(func() {
|
|
require.NoError(t, diffReconcileResults(
|
|
reconcileResults{Applications: []appReconcileResult{{
|
|
Name: "app1",
|
|
Sync: &v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
|
|
}}},
|
|
reconcileResults{Applications: []appReconcileResult{{
|
|
Name: "app1",
|
|
Sync: &v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
|
|
}}},
|
|
))
|
|
})
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "app1\n", logs)
|
|
}
|
|
|
|
func TestDiffReconcileResults_DifferentApps(t *testing.T) {
|
|
logs, err := captureStdout(func() {
|
|
require.NoError(t, diffReconcileResults(
|
|
reconcileResults{Applications: []appReconcileResult{{
|
|
Name: "app1",
|
|
Sync: &v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
|
|
}, {
|
|
Name: "app2",
|
|
Sync: &v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
|
|
}}},
|
|
reconcileResults{Applications: []appReconcileResult{{
|
|
Name: "app1",
|
|
Sync: &v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
|
|
}, {
|
|
Name: "app3",
|
|
Sync: &v1alpha1.SyncStatus{Status: v1alpha1.SyncStatusCodeOutOfSync},
|
|
}}},
|
|
))
|
|
})
|
|
require.NoError(t, err)
|
|
assert.Equal(t, `app1
|
|
app2
|
|
1,9d0
|
|
< conditions: null
|
|
< health: ""
|
|
< name: app2
|
|
< sync:
|
|
< comparedTo:
|
|
< destination: {}
|
|
< source:
|
|
< repoURL: ""
|
|
< status: OutOfSync
|
|
app3
|
|
0a1,9
|
|
> conditions: null
|
|
> health: ""
|
|
> name: app3
|
|
> sync:
|
|
> comparedTo:
|
|
> destination: {}
|
|
> source:
|
|
> repoURL: ""
|
|
> status: OutOfSync
|
|
`, logs)
|
|
}
|