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]>
187 lines
6.2 KiB
Go
187 lines
6.2 KiB
Go
package generators
|
|
|
|
import (
|
|
"fmt"
|
|
"reflect"
|
|
|
|
"github.com/jeremywohl/flatten"
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
"github.com/hanzoai/deploy/applicationset/utils"
|
|
|
|
"k8s.io/apimachinery/pkg/labels"
|
|
|
|
argoprojiov1alpha1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
|
|
"dario.cat/mergo"
|
|
log "github.com/sirupsen/logrus"
|
|
)
|
|
|
|
const (
|
|
selectorKey = "Selector"
|
|
)
|
|
|
|
type TransformResult struct {
|
|
Params []map[string]any
|
|
Template argoprojiov1alpha1.ApplicationSetTemplate
|
|
}
|
|
|
|
// Transform a spec generator to list of paramSets and a template
|
|
func Transform(requestedGenerator argoprojiov1alpha1.ApplicationSetGenerator, allGenerators map[string]Generator, baseTemplate argoprojiov1alpha1.ApplicationSetTemplate, appSet *argoprojiov1alpha1.ApplicationSet, genParams map[string]any, client client.Client) ([]TransformResult, error) {
|
|
// This is a custom version of the `LabelSelectorAsSelector` that is in k8s.io/apimachinery. This has been copied
|
|
// verbatim from that package, with the difference that we do not have any restrictions on label values. This is done
|
|
// so that, among other things, we can match on cluster urls.
|
|
selector, err := utils.LabelSelectorAsSelector(requestedGenerator.Selector)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error parsing label selector: %w", err)
|
|
}
|
|
|
|
res := []TransformResult{}
|
|
var firstError error
|
|
interpolatedGenerator := requestedGenerator.DeepCopy()
|
|
|
|
generators := GetRelevantGenerators(&requestedGenerator, allGenerators)
|
|
for _, g := range generators {
|
|
// we call mergeGeneratorTemplate first because GenerateParams might be more costly so we want to fail fast if there is an error
|
|
mergedTemplate, err := mergeGeneratorTemplate(g, &requestedGenerator, baseTemplate)
|
|
if err != nil {
|
|
log.WithError(err).WithField("generator", g).
|
|
Error("error generating params")
|
|
if firstError == nil {
|
|
firstError = err
|
|
}
|
|
continue
|
|
}
|
|
var params []map[string]any
|
|
if len(genParams) != 0 {
|
|
tempInterpolatedGenerator, err := InterpolateGenerator(&requestedGenerator, genParams, appSet.Spec.GoTemplate, appSet.Spec.GoTemplateOptions)
|
|
interpolatedGenerator = &tempInterpolatedGenerator
|
|
if err != nil {
|
|
log.WithError(err).WithField("genParams", genParams).
|
|
Error("error interpolating params for generator")
|
|
if firstError == nil {
|
|
firstError = err
|
|
}
|
|
continue
|
|
}
|
|
}
|
|
params, err = g.GenerateParams(interpolatedGenerator, appSet, client)
|
|
if err != nil {
|
|
log.WithError(err).WithField("generator", g).
|
|
Error("error generating params")
|
|
if firstError == nil {
|
|
firstError = err
|
|
}
|
|
continue
|
|
}
|
|
var filterParams []map[string]any
|
|
for _, param := range params {
|
|
flatParam, err := flattenParameters(param)
|
|
if err != nil {
|
|
log.WithError(err).WithField("generator", g).
|
|
Error("error flattening params")
|
|
if firstError == nil {
|
|
firstError = err
|
|
}
|
|
continue
|
|
}
|
|
|
|
if requestedGenerator.Selector != nil && !selector.Matches(labels.Set(flatParam)) {
|
|
continue
|
|
}
|
|
filterParams = append(filterParams, param)
|
|
}
|
|
|
|
res = append(res, TransformResult{
|
|
Params: filterParams,
|
|
Template: mergedTemplate,
|
|
})
|
|
}
|
|
|
|
return res, firstError
|
|
}
|
|
|
|
func GetRelevantGenerators(requestedGenerator *argoprojiov1alpha1.ApplicationSetGenerator, generators map[string]Generator) []Generator {
|
|
var res []Generator
|
|
|
|
v := reflect.Indirect(reflect.ValueOf(requestedGenerator))
|
|
for i := 0; i < v.NumField(); i++ {
|
|
field := v.Field(i)
|
|
if !field.CanInterface() {
|
|
continue
|
|
}
|
|
name := v.Type().Field(i).Name
|
|
if name == selectorKey {
|
|
continue
|
|
}
|
|
|
|
if !reflect.ValueOf(field.Interface()).IsNil() {
|
|
res = append(res, generators[name])
|
|
}
|
|
}
|
|
|
|
return res
|
|
}
|
|
|
|
func flattenParameters(in map[string]any) (map[string]string, error) {
|
|
flat, err := flatten.Flatten(normalizeMapForFlatten(in), "", flatten.DotStyle)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error flatenning parameters: %w", err)
|
|
}
|
|
|
|
out := make(map[string]string, len(flat))
|
|
for k, v := range flat {
|
|
out[k] = fmt.Sprintf("%v", v)
|
|
}
|
|
|
|
return out, nil
|
|
}
|
|
|
|
// normalizeMapForFlatten recursively converts map[string]string values to
|
|
// map[string]interface{} so that flatten.Flatten can recurse into them.
|
|
// flatten.Flatten only recurses into map[string]interface{} and []interface{};
|
|
// map[string]string is treated as an opaque leaf, causing individual keys
|
|
// (e.g. metadata.labels.environment) to be absent from the flat output and
|
|
// silently breaking post-generator selector matching in GoTemplate mode.
|
|
func normalizeMapForFlatten(in map[string]any) map[string]any {
|
|
out := make(map[string]any, len(in))
|
|
for k, v := range in {
|
|
switch cast := v.(type) {
|
|
case map[string]string:
|
|
inner := make(map[string]any, len(cast))
|
|
for ik, iv := range cast {
|
|
inner[ik] = iv
|
|
}
|
|
out[k] = inner
|
|
case map[string]any:
|
|
out[k] = normalizeMapForFlatten(cast)
|
|
default:
|
|
out[k] = v
|
|
}
|
|
}
|
|
return out
|
|
}
|
|
|
|
func mergeGeneratorTemplate(g Generator, requestedGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetTemplate argoprojiov1alpha1.ApplicationSetTemplate) (argoprojiov1alpha1.ApplicationSetTemplate, error) {
|
|
// Make a copy of the value from `GetTemplate()` before merge, rather than copying directly into
|
|
// the provided parameter (which will touch the original resource object returned by client-go)
|
|
dest := g.GetTemplate(requestedGenerator).DeepCopy()
|
|
|
|
err := mergo.Merge(dest, applicationSetTemplate)
|
|
|
|
return *dest, err
|
|
}
|
|
|
|
// InterpolateGenerator allows interpolating the matrix's 2nd child generator with values from the 1st child generator
|
|
// "params" parameter is an array, where each index corresponds to a generator. Each index contains a map w/ that generator's parameters.
|
|
func InterpolateGenerator(requestedGenerator *argoprojiov1alpha1.ApplicationSetGenerator, params map[string]any, useGoTemplate bool, goTemplateOptions []string) (argoprojiov1alpha1.ApplicationSetGenerator, error) {
|
|
render := utils.Render{}
|
|
interpolatedGenerator, err := render.RenderGeneratorParams(requestedGenerator, params, useGoTemplate, goTemplateOptions)
|
|
if err != nil {
|
|
log.WithError(err).WithField("interpolatedGenerator", interpolatedGenerator).Error("error interpolating generator with other generator's parameter")
|
|
return argoprojiov1alpha1.ApplicationSetGenerator{}, err
|
|
}
|
|
|
|
return *interpolatedGenerator, nil
|
|
}
|