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]>
253 lines
7.4 KiB
Go
253 lines
7.4 KiB
Go
package metrics
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
"github.com/prometheus/client_golang/prometheus/promhttp"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
|
|
"sigs.k8s.io/controller-runtime/pkg/client/fake"
|
|
"sigs.k8s.io/controller-runtime/pkg/metrics"
|
|
"sigs.k8s.io/yaml"
|
|
|
|
"github.com/hanzoai/deploy/applicationset/utils"
|
|
argoappv1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
metricsutil "github.com/hanzoai/deploy/util/metrics"
|
|
)
|
|
|
|
var (
|
|
applicationsetNamespaces = []string{"argocd", "test-namespace1"}
|
|
|
|
filter = func(appset *argoappv1.ApplicationSet) bool {
|
|
return utils.IsNamespaceAllowed(applicationsetNamespaces, appset.Namespace)
|
|
}
|
|
|
|
collectedLabels = []string{"included/test"}
|
|
)
|
|
|
|
const fakeAppsetList = `
|
|
apiVersion: argoproj.io/v1alpha1
|
|
kind: ApplicationSet
|
|
metadata:
|
|
name: test1
|
|
namespace: argocd
|
|
labels:
|
|
included/test: test
|
|
not-included.label/test: test
|
|
spec:
|
|
generators:
|
|
- git:
|
|
directories:
|
|
- path: test/*
|
|
repoURL: https://github.com/test/test.git
|
|
revision: HEAD
|
|
template:
|
|
metadata:
|
|
name: '{{.path.basename}}'
|
|
spec:
|
|
destination:
|
|
namespace: '{{.path.basename}}'
|
|
server: https://kubernetes.default.svc
|
|
project: default
|
|
source:
|
|
path: '{{.path.path}}'
|
|
repoURL: https://github.com/test/test.git
|
|
targetRevision: HEAD
|
|
status:
|
|
resources:
|
|
- group: argoproj.io
|
|
health:
|
|
status: Missing
|
|
kind: Application
|
|
name: test-app1
|
|
namespace: argocd
|
|
status: OutOfSync
|
|
version: v1alpha1
|
|
- group: argoproj.io
|
|
health:
|
|
status: Missing
|
|
kind: Application
|
|
name: test-app2
|
|
namespace: argocd
|
|
status: OutOfSync
|
|
version: v1alpha1
|
|
conditions:
|
|
- lastTransitionTime: "2024-01-01T00:00:00Z"
|
|
message: Successfully generated parameters for all Applications
|
|
reason: ApplicationSetUpToDate
|
|
status: "False"
|
|
type: ErrorOccurred
|
|
- lastTransitionTime: "2024-01-01T00:00:00Z"
|
|
message: Successfully generated parameters for all Applications
|
|
reason: ParametersGenerated
|
|
status: "True"
|
|
type: ParametersGenerated
|
|
- lastTransitionTime: "2024-01-01T00:00:00Z"
|
|
message: ApplicationSet up to date
|
|
reason: ApplicationSetUpToDate
|
|
status: "True"
|
|
type: ResourcesUpToDate
|
|
---
|
|
apiVersion: argoproj.io/v1alpha1
|
|
kind: ApplicationSet
|
|
metadata:
|
|
name: test2
|
|
namespace: argocd
|
|
labels:
|
|
not-included.label/test: test
|
|
spec:
|
|
generators:
|
|
- git:
|
|
directories:
|
|
- path: test/*
|
|
repoURL: https://github.com/test/test.git
|
|
revision: HEAD
|
|
template:
|
|
metadata:
|
|
name: '{{.path.basename}}'
|
|
spec:
|
|
destination:
|
|
namespace: '{{.path.basename}}'
|
|
server: https://kubernetes.default.svc
|
|
project: default
|
|
source:
|
|
path: '{{.path.path}}'
|
|
repoURL: https://github.com/test/test.git
|
|
targetRevision: HEAD
|
|
---
|
|
apiVersion: argoproj.io/v1alpha1
|
|
kind: ApplicationSet
|
|
metadata:
|
|
name: should-be-filtered-out
|
|
namespace: not-allowed
|
|
spec:
|
|
generators:
|
|
- git:
|
|
directories:
|
|
- path: test/*
|
|
repoURL: https://github.com/test/test.git
|
|
revision: HEAD
|
|
template:
|
|
metadata:
|
|
name: '{{.path.basename}}'
|
|
spec:
|
|
destination:
|
|
namespace: '{{.path.basename}}'
|
|
server: https://kubernetes.default.svc
|
|
project: default
|
|
source:
|
|
path: '{{.path.path}}'
|
|
repoURL: https://github.com/test/test.git
|
|
targetRevision: HEAD
|
|
`
|
|
|
|
func newFakeAppsets(fakeAppsetYAML string) []argoappv1.ApplicationSet {
|
|
var results []argoappv1.ApplicationSet
|
|
|
|
appsetRawYamls := strings.SplitSeq(fakeAppsetYAML, "---")
|
|
|
|
for appsetRawYaml := range appsetRawYamls {
|
|
var appset argoappv1.ApplicationSet
|
|
err := yaml.Unmarshal([]byte(appsetRawYaml), &appset)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
results = append(results, appset)
|
|
}
|
|
|
|
return results
|
|
}
|
|
|
|
func TestApplicationsetCollector(t *testing.T) {
|
|
appsetList := newFakeAppsets(fakeAppsetList)
|
|
client := initializeClient(appsetList)
|
|
metrics.Registry = prometheus.NewRegistry()
|
|
|
|
appsetCollector := newAppsetCollector(utils.NewAppsetLister(client), collectedLabels, filter)
|
|
|
|
metrics.Registry.MustRegister(appsetCollector)
|
|
req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", http.NoBody)
|
|
require.NoError(t, err)
|
|
rr := httptest.NewRecorder()
|
|
handler := promhttp.HandlerFor(metrics.Registry, promhttp.HandlerOpts{})
|
|
handler.ServeHTTP(rr, req)
|
|
|
|
assert.Equal(t, http.StatusOK, rr.Code)
|
|
// Test correct appset_info and owned applications
|
|
assert.Contains(t, rr.Body.String(), `
|
|
argocd_appset_info{name="test1",namespace="argocd",resource_update_status="ApplicationSetUpToDate"} 1
|
|
`)
|
|
assert.Contains(t, rr.Body.String(), `
|
|
argocd_appset_owned_applications{name="test1",namespace="argocd"} 2
|
|
`)
|
|
// Test labels collection - should not include labels not included in the list of collected labels and include the ones that do.
|
|
assert.Contains(t, rr.Body.String(), `
|
|
argocd_appset_labels{label_included_test="test",name="test1",namespace="argocd"} 1
|
|
`)
|
|
assert.NotContains(t, rr.Body.String(), normalizeLabel("not-included.label/test"))
|
|
// If collected label is not present on the applicationset the value should be empty
|
|
assert.Contains(t, rr.Body.String(), `
|
|
argocd_appset_labels{label_included_test="",name="test2",namespace="argocd"} 1
|
|
`)
|
|
// If ResourcesUpToDate condition is not present on the applicationset the status should be reported as 'Unknown'
|
|
assert.Contains(t, rr.Body.String(), `
|
|
argocd_appset_info{name="test2",namespace="argocd",resource_update_status="Unknown"} 1
|
|
`)
|
|
// If there are no resources on the applicationset the owned application gague should return 0
|
|
assert.Contains(t, rr.Body.String(), `
|
|
argocd_appset_owned_applications{name="test2",namespace="argocd"} 0
|
|
`)
|
|
// Test that filter is working
|
|
assert.NotContains(t, rr.Body.String(), `name="should-be-filtered-out"`)
|
|
}
|
|
|
|
func TestObserveReconcile(t *testing.T) {
|
|
appsetList := newFakeAppsets(fakeAppsetList)
|
|
client := initializeClient(appsetList)
|
|
metrics.Registry = prometheus.NewRegistry()
|
|
|
|
appsetMetrics := NewApplicationsetMetrics(utils.NewAppsetLister(client), collectedLabels, filter)
|
|
|
|
req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", http.NoBody)
|
|
require.NoError(t, err)
|
|
rr := httptest.NewRecorder()
|
|
handler := promhttp.HandlerFor(metrics.Registry, promhttp.HandlerOpts{})
|
|
appsetMetrics.ObserveReconcile(&appsetList[0], 5*time.Second)
|
|
handler.ServeHTTP(rr, req)
|
|
assert.Contains(t, rr.Body.String(), `
|
|
argocd_appset_reconcile_sum{name="test1",namespace="argocd"} 5
|
|
`)
|
|
// If there are no resources on the applicationset the owned application gague should return 0
|
|
assert.Contains(t, rr.Body.String(), `
|
|
argocd_appset_reconcile_count{name="test1",namespace="argocd"} 1
|
|
`)
|
|
}
|
|
|
|
func initializeClient(appsets []argoappv1.ApplicationSet) ctrlclient.WithWatch {
|
|
scheme := runtime.NewScheme()
|
|
err := argoappv1.AddToScheme(scheme)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
var clientObjects []ctrlclient.Object
|
|
|
|
for _, appset := range appsets {
|
|
clientObjects = append(clientObjects, appset.DeepCopy())
|
|
}
|
|
|
|
return fake.NewClientBuilder().WithScheme(scheme).WithObjects(clientObjects...).Build()
|
|
}
|
|
|
|
func normalizeLabel(label string) string {
|
|
return metricsutil.NormalizeLabels("label", []string{label})[0]
|
|
}
|