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]>
229 lines
8.0 KiB
Go
229 lines
8.0 KiB
Go
package generators
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"maps"
|
|
"time"
|
|
|
|
"dario.cat/mergo"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
argoprojiov1alpha1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
var _ Generator = (*MergeGenerator)(nil)
|
|
|
|
var (
|
|
ErrLessThanTwoGeneratorsInMerge = errors.New("found less than two generators, Merge requires two or more")
|
|
ErrNoMergeKeys = errors.New("no merge keys were specified, Merge requires at least one")
|
|
ErrNonUniqueParamSets = errors.New("the parameters from a generator were not unique by the given mergeKeys, Merge requires all param sets to be unique")
|
|
)
|
|
|
|
type MergeGenerator struct {
|
|
// The inner generators supported by the merge generator (cluster, git, list...)
|
|
supportedGenerators map[string]Generator
|
|
}
|
|
|
|
// NewMergeGenerator returns a MergeGenerator which allows the given supportedGenerators as child generators.
|
|
func NewMergeGenerator(supportedGenerators map[string]Generator) Generator {
|
|
m := &MergeGenerator{
|
|
supportedGenerators: supportedGenerators,
|
|
}
|
|
return m
|
|
}
|
|
|
|
// getParamSetsForAllGenerators generates params for each child generator in a MergeGenerator. Param sets are returned
|
|
// in slices ordered according to the order of the given generators.
|
|
func (m *MergeGenerator) getParamSetsForAllGenerators(generators []argoprojiov1alpha1.ApplicationSetNestedGenerator, appSet *argoprojiov1alpha1.ApplicationSet, client client.Client) ([][]map[string]any, error) {
|
|
var paramSets [][]map[string]any
|
|
for i, generator := range generators {
|
|
generatorParamSets, err := m.getParams(generator, appSet, client)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error getting params from generator %d of %d: %w", i+1, len(generators), err)
|
|
}
|
|
// concatenate param lists produced by each generator
|
|
paramSets = append(paramSets, generatorParamSets)
|
|
}
|
|
return paramSets, nil
|
|
}
|
|
|
|
// GenerateParams gets the params produced by the MergeGenerator.
|
|
func (m *MergeGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, appSet *argoprojiov1alpha1.ApplicationSet, client client.Client) ([]map[string]any, error) {
|
|
if appSetGenerator.Merge == nil {
|
|
return nil, ErrEmptyAppSetGenerator
|
|
}
|
|
|
|
if len(appSetGenerator.Merge.Generators) < 2 {
|
|
return nil, ErrLessThanTwoGeneratorsInMerge
|
|
}
|
|
|
|
paramSetsFromGenerators, err := m.getParamSetsForAllGenerators(appSetGenerator.Merge.Generators, appSet, client)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error getting param sets from generators: %w", err)
|
|
}
|
|
|
|
baseParamSetsByMergeKey, err := getParamSetsByMergeKey(appSetGenerator.Merge.MergeKeys, paramSetsFromGenerators[0])
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error getting param sets by merge key: %w", err)
|
|
}
|
|
|
|
for _, paramSets := range paramSetsFromGenerators[1:] {
|
|
paramSetsByMergeKey, err := getParamSetsByMergeKey(appSetGenerator.Merge.MergeKeys, paramSets)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error getting param sets by merge key: %w", err)
|
|
}
|
|
|
|
for mergeKeyValue, baseParamSet := range baseParamSetsByMergeKey {
|
|
if overrideParamSet, exists := paramSetsByMergeKey[mergeKeyValue]; exists {
|
|
if appSet.Spec.GoTemplate {
|
|
if err := mergo.Merge(&baseParamSet, overrideParamSet, mergo.WithOverride); err != nil {
|
|
return nil, fmt.Errorf("error merging base param set with override param set: %w", err)
|
|
}
|
|
baseParamSetsByMergeKey[mergeKeyValue] = baseParamSet
|
|
} else {
|
|
maps.Copy(baseParamSet, overrideParamSet)
|
|
baseParamSetsByMergeKey[mergeKeyValue] = baseParamSet
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
mergedParamSets := make([]map[string]any, len(baseParamSetsByMergeKey))
|
|
i := 0
|
|
for _, mergedParamSet := range baseParamSetsByMergeKey {
|
|
mergedParamSets[i] = mergedParamSet
|
|
i++
|
|
}
|
|
|
|
return mergedParamSets, nil
|
|
}
|
|
|
|
// getParamSetsByMergeKey converts the given list of parameter sets to a map of parameter sets where the key is the
|
|
// unique key of the parameter set as determined by the given mergeKeys. If any two parameter sets share the same merge
|
|
// key, getParamSetsByMergeKey will throw NonUniqueParamSets.
|
|
func getParamSetsByMergeKey(mergeKeys []string, paramSets []map[string]any) (map[string]map[string]any, error) {
|
|
if len(mergeKeys) < 1 {
|
|
return nil, ErrNoMergeKeys
|
|
}
|
|
|
|
deDuplicatedMergeKeys := make(map[string]bool, len(mergeKeys))
|
|
for _, mergeKey := range mergeKeys {
|
|
deDuplicatedMergeKeys[mergeKey] = false
|
|
}
|
|
|
|
paramSetsByMergeKey := make(map[string]map[string]any, len(paramSets))
|
|
for _, paramSet := range paramSets {
|
|
paramSetKey := make(map[string]any)
|
|
for mergeKey := range deDuplicatedMergeKeys {
|
|
paramSetKey[mergeKey] = paramSet[mergeKey]
|
|
}
|
|
paramSetKeyJSON, err := json.Marshal(paramSetKey)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error marshalling param set key json: %w", err)
|
|
}
|
|
paramSetKeyString := string(paramSetKeyJSON)
|
|
if _, exists := paramSetsByMergeKey[paramSetKeyString]; exists {
|
|
return nil, fmt.Errorf("%w. Duplicate key was %s", ErrNonUniqueParamSets, paramSetKeyString)
|
|
}
|
|
paramSetsByMergeKey[paramSetKeyString] = paramSet
|
|
}
|
|
|
|
return paramSetsByMergeKey, nil
|
|
}
|
|
|
|
// getParams get the parameters generated by this generator.
|
|
func (m *MergeGenerator) getParams(appSetBaseGenerator argoprojiov1alpha1.ApplicationSetNestedGenerator, appSet *argoprojiov1alpha1.ApplicationSet, client client.Client) ([]map[string]any, error) {
|
|
matrixGen, err := getMatrixGenerator(appSetBaseGenerator)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
mergeGen, err := getMergeGenerator(appSetBaseGenerator)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
t, err := Transform(
|
|
argoprojiov1alpha1.ApplicationSetGenerator{
|
|
List: appSetBaseGenerator.List,
|
|
Clusters: appSetBaseGenerator.Clusters,
|
|
Git: appSetBaseGenerator.Git,
|
|
SCMProvider: appSetBaseGenerator.SCMProvider,
|
|
ClusterDecisionResource: appSetBaseGenerator.ClusterDecisionResource,
|
|
PullRequest: appSetBaseGenerator.PullRequest,
|
|
Plugin: appSetBaseGenerator.Plugin,
|
|
Matrix: matrixGen,
|
|
Merge: mergeGen,
|
|
Selector: appSetBaseGenerator.Selector,
|
|
},
|
|
m.supportedGenerators,
|
|
argoprojiov1alpha1.ApplicationSetTemplate{},
|
|
appSet,
|
|
map[string]any{}, client)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("child generator returned an error on parameter generation: %w", err)
|
|
}
|
|
|
|
if len(t) == 0 {
|
|
return nil, errors.New("child generator generated no parameters")
|
|
}
|
|
|
|
if len(t) > 1 {
|
|
return nil, ErrMoreThenOneInnerGenerators
|
|
}
|
|
|
|
return t[0].Params, nil
|
|
}
|
|
|
|
func (m *MergeGenerator) GetRequeueAfter(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator) time.Duration {
|
|
res := maxDuration
|
|
var found bool
|
|
|
|
for _, r := range appSetGenerator.Merge.Generators {
|
|
matrixGen, _ := getMatrixGenerator(r)
|
|
mergeGen, _ := getMergeGenerator(r)
|
|
base := &argoprojiov1alpha1.ApplicationSetGenerator{
|
|
List: r.List,
|
|
Clusters: r.Clusters,
|
|
Git: r.Git,
|
|
PullRequest: r.PullRequest,
|
|
Plugin: r.Plugin,
|
|
SCMProvider: r.SCMProvider,
|
|
ClusterDecisionResource: r.ClusterDecisionResource,
|
|
Matrix: matrixGen,
|
|
Merge: mergeGen,
|
|
}
|
|
generators := GetRelevantGenerators(base, m.supportedGenerators)
|
|
|
|
for _, g := range generators {
|
|
temp := g.GetRequeueAfter(base)
|
|
if temp < res && temp != NoRequeueAfter {
|
|
found = true
|
|
res = temp
|
|
}
|
|
}
|
|
}
|
|
|
|
if found {
|
|
return res
|
|
}
|
|
return NoRequeueAfter
|
|
}
|
|
|
|
func getMergeGenerator(r argoprojiov1alpha1.ApplicationSetNestedGenerator) (*argoprojiov1alpha1.MergeGenerator, error) {
|
|
if r.Merge == nil {
|
|
return nil, nil
|
|
}
|
|
merge, err := argoprojiov1alpha1.ToNestedMergeGenerator(r.Merge)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error converting to nested merge generator: %w", err)
|
|
}
|
|
return merge.ToMergeGenerator(), nil
|
|
}
|
|
|
|
// GetTemplate gets the Template field for the MergeGenerator.
|
|
func (m *MergeGenerator) GetTemplate(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator) *argoprojiov1alpha1.ApplicationSetTemplate {
|
|
return &appSetGenerator.Merge.Template
|
|
}
|