mirror of
https://github.com/hanzoai/cd.git
synced 2026-10-30 14:56:45 +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]>
149 lines
6.0 KiB
Go
149 lines
6.0 KiB
Go
package controller
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"maps"
|
|
|
|
"github.com/hanzoai/deploy/controller/hydrator/types"
|
|
appv1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/reposerver/apiclient"
|
|
argoutil "github.com/hanzoai/deploy/util/argo"
|
|
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
)
|
|
|
|
/**
|
|
This file implements the hydrator.Dependencies interface for the ApplicationController.
|
|
|
|
Hydration logic does not belong in this file. The methods here should be "bookkeeping" methods that keep hydration work
|
|
in the hydrator and app controller work in the app controller. The only purpose of this file is to provide the hydrator
|
|
safe, minimal access to certain app controller functionality to avoid duplicate code.
|
|
*/
|
|
|
|
func (ctrl *ApplicationController) GetProcessableAppProj(app *appv1.Application) (*appv1.AppProject, error) {
|
|
return ctrl.getAppProj(app)
|
|
}
|
|
|
|
// GetProcessableApps returns a list of applications that are processable by the controller.
|
|
func (ctrl *ApplicationController) GetProcessableApps() (*appv1.ApplicationList, error) {
|
|
// getAppList already filters out applications that are not processable by the controller.
|
|
return ctrl.getAppList(metav1.ListOptions{})
|
|
}
|
|
|
|
func (ctrl *ApplicationController) EvaluateAppRevisionsChanges(ctx context.Context, app *appv1.Application, source appv1.ApplicationSource, revision string, project *appv1.AppProject, noRevisionCache bool) (bool, string, error) {
|
|
sources := []appv1.ApplicationSource{source}
|
|
revisions := []string{revision}
|
|
|
|
hasChanges, resolvedRevisions, err := ctrl.appStateManager.EvaluateAppRevisionsChanges(ctx, app, sources, revisions, project, false, noRevisionCache)
|
|
if err != nil {
|
|
return false, "", err
|
|
}
|
|
if len(resolvedRevisions) != 1 {
|
|
return false, "", fmt.Errorf("expected exactly one resolved revision for single source, got %d", len(resolvedRevisions))
|
|
}
|
|
if resolvedRevisions[0] == "" {
|
|
return false, "", errors.New("resolved revision is empty for dry source")
|
|
}
|
|
return hasChanges, resolvedRevisions[0], nil
|
|
}
|
|
|
|
func (ctrl *ApplicationController) GetRepoObjs(ctx context.Context, app *appv1.Application, drySource appv1.ApplicationSource, revision string, project *appv1.AppProject) ([]*unstructured.Unstructured, *apiclient.ManifestResponse, error) {
|
|
drySources := []appv1.ApplicationSource{drySource}
|
|
dryRevisions := []string{revision}
|
|
|
|
appLabelKey, err := ctrl.settingsMgr.GetAppInstanceLabelKey()
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("failed to get app instance label key: %w", err)
|
|
}
|
|
|
|
// FIXME: use cache and revision cache
|
|
objs, resp, _, err := ctrl.appStateManager.GetRepoObjs(ctx, app, drySources, appLabelKey, dryRevisions, true, true, project.EffectiveSourceIntegrity(), project, false)
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("failed to get repo objects: %w", err)
|
|
}
|
|
|
|
trackingMethod, err := ctrl.settingsMgr.GetTrackingMethod()
|
|
if err != nil {
|
|
return nil, nil, fmt.Errorf("failed to get tracking method: %w", err)
|
|
}
|
|
for _, obj := range objs {
|
|
if err := argoutil.NewResourceTracking().RemoveAppInstance(obj, trackingMethod); err != nil {
|
|
return nil, nil, fmt.Errorf("failed to remove the app instance value: %w", err)
|
|
}
|
|
}
|
|
|
|
if len(resp) != 1 {
|
|
return nil, nil, fmt.Errorf("expected one manifest response, got %d", len(resp))
|
|
}
|
|
|
|
return objs, resp[0], nil
|
|
}
|
|
|
|
func (ctrl *ApplicationController) GetWriteCredentials(ctx context.Context, repoURL string, project string) (*appv1.Repository, error) {
|
|
return ctrl.db.GetWriteRepository(ctx, repoURL, project)
|
|
}
|
|
|
|
func (ctrl *ApplicationController) RequestAppRefresh(appName string, appNamespace string) error {
|
|
// We request a refresh by setting the annotation instead of by adding it to the refresh queue, because there is no
|
|
// guarantee that the hydrator is running on the same controller shard as is processing the application.
|
|
|
|
// This function is called for each app after a hydrate operation is completed so that the app controller can pick
|
|
// up the newly-hydrated changes. So we pass nil hydrateType to avoid a hydrate loop.
|
|
_, err := argoutil.RefreshApp(ctrl.applicationClientset.ArgoprojV1alpha1().Applications(appNamespace), appName, appv1.RefreshTypeNormal, nil)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to request app refresh: %w", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (ctrl *ApplicationController) PersistHydrationStatus(orig *appv1.Application, newStatus *appv1.SourceHydratorStatus) {
|
|
newAnnotations := make(map[string]string)
|
|
maps.Copy(newAnnotations, orig.GetAnnotations())
|
|
delete(newAnnotations, appv1.AnnotationKeyHydrate)
|
|
status := orig.Status.DeepCopy()
|
|
status.SourceHydrator = *newStatus
|
|
// PersistHydrationStatus has no request context; the status write roots its own trace.
|
|
ctrl.persistAppStatus(context.Background(), orig, status, newAnnotations)
|
|
}
|
|
|
|
func (ctrl *ApplicationController) AddHydrationQueueItem(key types.HydrationQueueKey) {
|
|
ctrl.hydrationQueue.AddRateLimited(key)
|
|
}
|
|
|
|
func (ctrl *ApplicationController) GetHydratorCommitMessageTemplate() (string, error) {
|
|
sourceHydratorCommitMessageKey, err := ctrl.settingsMgr.GetSourceHydratorCommitMessageTemplate()
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to get sourceHydrator commit message template key: %w", err)
|
|
}
|
|
|
|
return sourceHydratorCommitMessageKey, nil
|
|
}
|
|
|
|
func (ctrl *ApplicationController) GetHydratorReadmeMessageTemplate() (string, error) {
|
|
readmeTemplate, err := ctrl.settingsMgr.GetHydratorReadmeTemplate()
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to get sourceHydrator README message template: %w", err)
|
|
}
|
|
|
|
return readmeTemplate, nil
|
|
}
|
|
|
|
func (ctrl *ApplicationController) GetCommitAuthorName() (string, error) {
|
|
authorName, err := ctrl.settingsMgr.GetCommitAuthorName()
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to get commit author name: %w", err)
|
|
}
|
|
return authorName, nil
|
|
}
|
|
|
|
func (ctrl *ApplicationController) GetCommitAuthorEmail() (string, error) {
|
|
authorEmail, err := ctrl.settingsMgr.GetCommitAuthorEmail()
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to get commit author email: %w", err)
|
|
}
|
|
return authorEmail, nil
|
|
}
|