mirror of
https://github.com/hanzoai/deploy.git
synced 2026-10-07 08:44:50 +00:00
41536738c8
* 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]>
216 lines
8.1 KiB
Go
216 lines
8.1 KiB
Go
package controllers
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
corev1 "k8s.io/api/core/v1"
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
dynfake "k8s.io/client-go/dynamic/fake"
|
|
kubefake "k8s.io/client-go/kubernetes/fake"
|
|
"k8s.io/client-go/tools/record"
|
|
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
|
|
|
"github.com/hanzoai/deploy/applicationset/generators"
|
|
appsetmetrics "github.com/hanzoai/deploy/applicationset/metrics"
|
|
"github.com/hanzoai/deploy/applicationset/services/mocks"
|
|
argov1alpha1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/settings"
|
|
)
|
|
|
|
func TestRequeueAfter(t *testing.T) {
|
|
mockServer := &mocks.Repos{}
|
|
ctx := t.Context()
|
|
scheme := runtime.NewScheme()
|
|
err := argov1alpha1.AddToScheme(scheme)
|
|
require.NoError(t, err)
|
|
gvrToListKind := map[schema.GroupVersionResource]string{{
|
|
Group: "mallard.io",
|
|
Version: "v1",
|
|
Resource: "ducks",
|
|
}: "DuckList"}
|
|
appClientset := kubefake.NewSimpleClientset()
|
|
k8sClient := fake.NewClientBuilder().Build()
|
|
duckType := &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"apiVersion": "v2quack",
|
|
"kind": "Duck",
|
|
"metadata": map[string]any{
|
|
"name": "mightyduck",
|
|
"namespace": "namespace",
|
|
"labels": map[string]any{"duck": "all-species"},
|
|
},
|
|
"status": map[string]any{
|
|
"decisions": []any{
|
|
map[string]any{
|
|
"clusterName": "staging-01",
|
|
},
|
|
map[string]any{
|
|
"clusterName": "production-01",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
fakeDynClient := dynfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), gvrToListKind, duckType)
|
|
scmConfig := generators.NewSCMConfig("", []string{""}, true, true, nil, true)
|
|
clusterInformer, err := settings.NewClusterInformer(appClientset, "argocd")
|
|
require.NoError(t, err)
|
|
|
|
defer startAndSyncInformer(t, clusterInformer)()
|
|
|
|
terminalGenerators := map[string]generators.Generator{
|
|
"List": generators.NewListGenerator(),
|
|
"Clusters": generators.NewClusterGenerator(k8sClient, "argocd"),
|
|
"Git": generators.NewGitGenerator(mockServer, "namespace"),
|
|
"SCMProvider": generators.NewSCMProviderGenerator(fake.NewClientBuilder().WithObjects(&corev1.Secret{}).Build(), scmConfig),
|
|
"ClusterDecisionResource": generators.NewDuckTypeGenerator(ctx, fakeDynClient, appClientset, "argocd", clusterInformer),
|
|
"PullRequest": generators.NewPullRequestGenerator(k8sClient, scmConfig),
|
|
}
|
|
|
|
nestedGenerators := map[string]generators.Generator{
|
|
"List": terminalGenerators["List"],
|
|
"Clusters": terminalGenerators["Clusters"],
|
|
"Git": terminalGenerators["Git"],
|
|
"SCMProvider": terminalGenerators["SCMProvider"],
|
|
"ClusterDecisionResource": terminalGenerators["ClusterDecisionResource"],
|
|
"PullRequest": terminalGenerators["PullRequest"],
|
|
"Matrix": generators.NewMatrixGenerator(terminalGenerators),
|
|
"Merge": generators.NewMergeGenerator(terminalGenerators),
|
|
}
|
|
|
|
topLevelGenerators := map[string]generators.Generator{
|
|
"List": terminalGenerators["List"],
|
|
"Clusters": terminalGenerators["Clusters"],
|
|
"Git": terminalGenerators["Git"],
|
|
"SCMProvider": terminalGenerators["SCMProvider"],
|
|
"ClusterDecisionResource": terminalGenerators["ClusterDecisionResource"],
|
|
"PullRequest": terminalGenerators["PullRequest"],
|
|
"Matrix": generators.NewMatrixGenerator(nestedGenerators),
|
|
"Merge": generators.NewMergeGenerator(nestedGenerators),
|
|
}
|
|
|
|
client := fake.NewClientBuilder().WithScheme(scheme).Build()
|
|
metrics := appsetmetrics.NewFakeAppsetMetrics()
|
|
r := ApplicationSetReconciler{
|
|
Client: client,
|
|
Scheme: scheme,
|
|
Recorder: record.NewFakeRecorder(0),
|
|
Generators: topLevelGenerators,
|
|
Metrics: metrics,
|
|
}
|
|
|
|
type args struct {
|
|
appset *argov1alpha1.ApplicationSet
|
|
requeueAfterOverride string
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want time.Duration
|
|
wantErr assert.ErrorAssertionFunc
|
|
}{
|
|
{name: "Cluster", args: args{
|
|
appset: &argov1alpha1.ApplicationSet{
|
|
Spec: argov1alpha1.ApplicationSetSpec{
|
|
Generators: []argov1alpha1.ApplicationSetGenerator{{Clusters: &argov1alpha1.ClusterGenerator{}}},
|
|
},
|
|
}, requeueAfterOverride: "",
|
|
}, want: generators.NoRequeueAfter, wantErr: assert.NoError},
|
|
{name: "ClusterMergeNested", args: args{&argov1alpha1.ApplicationSet{
|
|
Spec: argov1alpha1.ApplicationSetSpec{
|
|
Generators: []argov1alpha1.ApplicationSetGenerator{
|
|
{Clusters: &argov1alpha1.ClusterGenerator{}},
|
|
{Merge: &argov1alpha1.MergeGenerator{
|
|
Generators: []argov1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Clusters: &argov1alpha1.ClusterGenerator{},
|
|
Git: &argov1alpha1.GitGenerator{},
|
|
},
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
}, ""}, want: generators.DefaultRequeueAfter, wantErr: assert.NoError},
|
|
{name: "ClusterMatrixNested", args: args{&argov1alpha1.ApplicationSet{
|
|
Spec: argov1alpha1.ApplicationSetSpec{
|
|
Generators: []argov1alpha1.ApplicationSetGenerator{
|
|
{Clusters: &argov1alpha1.ClusterGenerator{}},
|
|
{Matrix: &argov1alpha1.MatrixGenerator{
|
|
Generators: []argov1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Clusters: &argov1alpha1.ClusterGenerator{},
|
|
Git: &argov1alpha1.GitGenerator{},
|
|
},
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
}, ""}, want: generators.DefaultRequeueAfter, wantErr: assert.NoError},
|
|
{name: "ListGenerator", args: args{appset: &argov1alpha1.ApplicationSet{
|
|
Spec: argov1alpha1.ApplicationSetSpec{
|
|
Generators: []argov1alpha1.ApplicationSetGenerator{{List: &argov1alpha1.ListGenerator{}}},
|
|
},
|
|
}}, want: generators.NoRequeueAfter, wantErr: assert.NoError},
|
|
{name: "DuckGenerator", args: args{appset: &argov1alpha1.ApplicationSet{
|
|
Spec: argov1alpha1.ApplicationSetSpec{
|
|
Generators: []argov1alpha1.ApplicationSetGenerator{{ClusterDecisionResource: &argov1alpha1.DuckTypeGenerator{}}},
|
|
},
|
|
}}, want: generators.DefaultRequeueAfter, wantErr: assert.NoError},
|
|
{name: "OverrideRequeueDuck", args: args{
|
|
appset: &argov1alpha1.ApplicationSet{
|
|
Spec: argov1alpha1.ApplicationSetSpec{
|
|
Generators: []argov1alpha1.ApplicationSetGenerator{{ClusterDecisionResource: &argov1alpha1.DuckTypeGenerator{}}},
|
|
},
|
|
}, requeueAfterOverride: "1h",
|
|
}, want: 1 * time.Hour, wantErr: assert.NoError},
|
|
{name: "OverrideRequeueGit", args: args{&argov1alpha1.ApplicationSet{
|
|
Spec: argov1alpha1.ApplicationSetSpec{
|
|
Generators: []argov1alpha1.ApplicationSetGenerator{
|
|
{Git: &argov1alpha1.GitGenerator{}},
|
|
},
|
|
},
|
|
}, "1h"}, want: 1 * time.Hour, wantErr: assert.NoError},
|
|
{name: "OverrideRequeueMatrix", args: args{&argov1alpha1.ApplicationSet{
|
|
Spec: argov1alpha1.ApplicationSetSpec{
|
|
Generators: []argov1alpha1.ApplicationSetGenerator{
|
|
{Clusters: &argov1alpha1.ClusterGenerator{}},
|
|
{Merge: &argov1alpha1.MergeGenerator{
|
|
Generators: []argov1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Clusters: &argov1alpha1.ClusterGenerator{},
|
|
Git: &argov1alpha1.GitGenerator{},
|
|
},
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
}, "5m"}, want: 5 * time.Minute, wantErr: assert.NoError},
|
|
{name: "OverrideRequeueMerge", args: args{&argov1alpha1.ApplicationSet{
|
|
Spec: argov1alpha1.ApplicationSetSpec{
|
|
Generators: []argov1alpha1.ApplicationSetGenerator{
|
|
{Clusters: &argov1alpha1.ClusterGenerator{}},
|
|
{Merge: &argov1alpha1.MergeGenerator{
|
|
Generators: []argov1alpha1.ApplicationSetNestedGenerator{
|
|
{
|
|
Clusters: &argov1alpha1.ClusterGenerator{},
|
|
Git: &argov1alpha1.GitGenerator{},
|
|
},
|
|
},
|
|
}},
|
|
},
|
|
},
|
|
}, "12s"}, want: 12 * time.Second, wantErr: assert.NoError},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
t.Setenv("ARGOCD_APPLICATIONSET_CONTROLLER_REQUEUE_AFTER", tt.args.requeueAfterOverride)
|
|
assert.Equalf(t, tt.want, r.getMinRequeueAfter(tt.args.appset), "getMinRequeueAfter(%v)", tt.args.appset)
|
|
})
|
|
}
|
|
}
|