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]>
245 lines
11 KiB
Go
245 lines
11 KiB
Go
package generators
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"strconv"
|
|
"time"
|
|
|
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
"github.com/gosimple/slug"
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/hanzoai/deploy/applicationset/services"
|
|
pullrequest "github.com/hanzoai/deploy/applicationset/services/pull_request"
|
|
"github.com/hanzoai/deploy/applicationset/utils"
|
|
argoprojiov1alpha1 "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
)
|
|
|
|
const (
|
|
DefaultPullRequestRequeueAfter = 30 * time.Minute
|
|
)
|
|
|
|
type PullRequestGenerator struct {
|
|
client client.Client
|
|
selectServiceProviderFunc func(context.Context, *argoprojiov1alpha1.PullRequestGenerator, *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error)
|
|
SCMConfig
|
|
}
|
|
|
|
func NewPullRequestGenerator(client client.Client, scmConfig SCMConfig) Generator {
|
|
g := &PullRequestGenerator{
|
|
client: client,
|
|
SCMConfig: scmConfig,
|
|
}
|
|
g.selectServiceProviderFunc = g.selectServiceProvider
|
|
return g
|
|
}
|
|
|
|
func (g *PullRequestGenerator) GetRequeueAfter(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator) time.Duration {
|
|
// Return a requeue default of 30 minutes, if no default is specified.
|
|
|
|
if appSetGenerator.PullRequest.RequeueAfterSeconds != nil {
|
|
return time.Duration(*appSetGenerator.PullRequest.RequeueAfterSeconds) * time.Second
|
|
}
|
|
|
|
return DefaultPullRequestRequeueAfter
|
|
}
|
|
|
|
func (g *PullRequestGenerator) GetContinueOnRepoNotFoundError(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator) bool {
|
|
return appSetGenerator.PullRequest.ContinueOnRepoNotFoundError
|
|
}
|
|
|
|
func (g *PullRequestGenerator) GetTemplate(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator) *argoprojiov1alpha1.ApplicationSetTemplate {
|
|
return &appSetGenerator.PullRequest.Template
|
|
}
|
|
|
|
func (g *PullRequestGenerator) GenerateParams(appSetGenerator *argoprojiov1alpha1.ApplicationSetGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet, _ client.Client) ([]map[string]any, error) {
|
|
if appSetGenerator == nil {
|
|
return nil, ErrEmptyAppSetGenerator
|
|
}
|
|
|
|
if appSetGenerator.PullRequest == nil {
|
|
return nil, ErrEmptyAppSetGenerator
|
|
}
|
|
|
|
ctx := context.Background()
|
|
svc, err := g.selectServiceProviderFunc(ctx, appSetGenerator.PullRequest, applicationSetInfo)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to select pull request service provider: %w", err)
|
|
}
|
|
|
|
pulls, err := pullrequest.ListPullRequests(ctx, svc, appSetGenerator.PullRequest.Filters)
|
|
params := make([]map[string]any, 0, len(pulls))
|
|
if err != nil {
|
|
if pullrequest.IsRepositoryNotFoundError(err) && g.GetContinueOnRepoNotFoundError(appSetGenerator) {
|
|
log.WithError(err).WithField("generator", g).
|
|
Warn("Skipping params generation for this repository since it was not found.")
|
|
return params, nil
|
|
}
|
|
return nil, fmt.Errorf("error listing repos: %w", err)
|
|
}
|
|
|
|
// In order to follow the DNS label standard as defined in RFC 1123,
|
|
// we need to limit the 'branch' to 50 to give room to append/suffix-ing it
|
|
// with 13 more characters. Also, there is the need to clean it as recommended
|
|
// here https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#dns-label-names
|
|
slug.MaxLength = 50
|
|
|
|
// Converting underscores to dashes
|
|
slug.CustomSub = map[string]string{
|
|
"_": "-",
|
|
}
|
|
|
|
var shortSHALength int
|
|
var shortSHALength7 int
|
|
for _, pull := range pulls {
|
|
shortSHALength = min(len(pull.HeadSHA), 8)
|
|
|
|
shortSHALength7 = min(len(pull.HeadSHA), 7)
|
|
|
|
paramMap := map[string]any{
|
|
"number": strconv.FormatInt(pull.Number, 10),
|
|
"title": pull.Title,
|
|
"branch": pull.Branch,
|
|
"branch_slug": slug.Make(pull.Branch),
|
|
"target_branch": pull.TargetBranch,
|
|
"target_branch_slug": slug.Make(pull.TargetBranch),
|
|
"head_sha": pull.HeadSHA,
|
|
"head_short_sha": pull.HeadSHA[:shortSHALength],
|
|
"head_short_sha_7": pull.HeadSHA[:shortSHALength7],
|
|
"author": pull.Author,
|
|
}
|
|
|
|
// PR lables will only be supported for Go Template appsets, since fasttemplate will be deprecated.
|
|
if applicationSetInfo != nil && applicationSetInfo.Spec.GoTemplate {
|
|
paramMap["labels"] = pull.Labels
|
|
}
|
|
|
|
err := appendTemplatedValues(appSetGenerator.PullRequest.Values, paramMap, applicationSetInfo.Spec.GoTemplate, applicationSetInfo.Spec.GoTemplateOptions)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to append templated values: %w", err)
|
|
}
|
|
params = append(params, paramMap)
|
|
}
|
|
return params, nil
|
|
}
|
|
|
|
// selectServiceProvider selects the provider to get pull requests from the configuration
|
|
func (g *PullRequestGenerator) selectServiceProvider(ctx context.Context, generatorConfig *argoprojiov1alpha1.PullRequestGenerator, applicationSetInfo *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
if !g.enableSCMProviders {
|
|
return nil, ErrSCMProvidersDisabled
|
|
}
|
|
if err := ScmProviderAllowed(applicationSetInfo, generatorConfig, g.allowedSCMProviders); err != nil {
|
|
return nil, fmt.Errorf("scm provider not allowed: %w", err)
|
|
}
|
|
|
|
if generatorConfig.Github != nil {
|
|
return g.github(ctx, generatorConfig.Github, applicationSetInfo)
|
|
}
|
|
if generatorConfig.GitLab != nil {
|
|
providerConfig := generatorConfig.GitLab
|
|
var caCerts []byte
|
|
var prErr error
|
|
if providerConfig.CARef != nil {
|
|
caCerts, prErr = utils.GetConfigMapData(ctx, g.client, providerConfig.CARef, applicationSetInfo.Namespace)
|
|
if prErr != nil {
|
|
return nil, fmt.Errorf("error fetching CA certificates from ConfigMap: %w", prErr)
|
|
}
|
|
}
|
|
token, err := utils.GetSecretRef(ctx, g.client, providerConfig.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret token: %w", err)
|
|
}
|
|
return pullrequest.NewGitLabService(token, providerConfig.API, providerConfig.Project, providerConfig.Labels, providerConfig.PullRequestState, g.scmRootCAPath, providerConfig.Insecure, caCerts, g.scmProxyURL, g.scmNoProxy)
|
|
}
|
|
if generatorConfig.Gitea != nil {
|
|
providerConfig := generatorConfig.Gitea
|
|
token, err := utils.GetSecretRef(ctx, g.client, providerConfig.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret token: %w", err)
|
|
}
|
|
|
|
return pullrequest.NewGiteaService(token, providerConfig.API, providerConfig.Owner, providerConfig.Repo, providerConfig.Labels, providerConfig.Insecure, g.scmProxyURL, g.scmNoProxy)
|
|
}
|
|
if generatorConfig.BitbucketServer != nil {
|
|
providerConfig := generatorConfig.BitbucketServer
|
|
var caCerts []byte
|
|
var prErr error
|
|
if providerConfig.CARef != nil {
|
|
caCerts, prErr = utils.GetConfigMapData(ctx, g.client, providerConfig.CARef, applicationSetInfo.Namespace)
|
|
if prErr != nil {
|
|
return nil, fmt.Errorf("error fetching CA certificates from ConfigMap: %w", prErr)
|
|
}
|
|
}
|
|
if providerConfig.BearerToken != nil {
|
|
appToken, err := utils.GetSecretRef(ctx, g.client, providerConfig.BearerToken.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret Bearer token: %w", err)
|
|
}
|
|
return pullrequest.NewBitbucketServiceBearerToken(ctx, appToken, providerConfig.API, providerConfig.Project, providerConfig.Repo, g.scmRootCAPath, providerConfig.Insecure, caCerts, g.scmProxyURL, g.scmNoProxy)
|
|
} else if providerConfig.BasicAuth != nil {
|
|
password, err := utils.GetSecretRef(ctx, g.client, providerConfig.BasicAuth.PasswordRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret token: %w", err)
|
|
}
|
|
return pullrequest.NewBitbucketServiceBasicAuth(ctx, providerConfig.BasicAuth.Username, password, providerConfig.API, providerConfig.Project, providerConfig.Repo, g.scmRootCAPath, providerConfig.Insecure, caCerts, g.scmProxyURL, g.scmNoProxy)
|
|
}
|
|
return pullrequest.NewBitbucketServiceNoAuth(ctx, providerConfig.API, providerConfig.Project, providerConfig.Repo, g.scmRootCAPath, providerConfig.Insecure, caCerts, g.scmProxyURL, g.scmNoProxy)
|
|
}
|
|
if generatorConfig.Bitbucket != nil {
|
|
providerConfig := generatorConfig.Bitbucket
|
|
if providerConfig.BearerToken != nil {
|
|
appToken, err := utils.GetSecretRef(ctx, g.client, providerConfig.BearerToken.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret Bearer token: %w", err)
|
|
}
|
|
return pullrequest.NewBitbucketCloudServiceBearerToken(providerConfig.API, appToken, providerConfig.Owner, providerConfig.Repo)
|
|
} else if providerConfig.BasicAuth != nil {
|
|
password, err := utils.GetSecretRef(ctx, g.client, providerConfig.BasicAuth.PasswordRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret token: %w", err)
|
|
}
|
|
return pullrequest.NewBitbucketCloudServiceBasicAuth(providerConfig.API, providerConfig.BasicAuth.Username, password, providerConfig.Owner, providerConfig.Repo)
|
|
}
|
|
return pullrequest.NewBitbucketCloudServiceNoAuth(providerConfig.API, providerConfig.Owner, providerConfig.Repo)
|
|
}
|
|
if generatorConfig.AzureDevOps != nil {
|
|
providerConfig := generatorConfig.AzureDevOps
|
|
token, err := utils.GetSecretRef(ctx, g.client, providerConfig.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret token: %w", err)
|
|
}
|
|
return pullrequest.NewAzureDevOpsService(token, providerConfig.API, providerConfig.Organization, providerConfig.Project, providerConfig.Repo, providerConfig.Labels)
|
|
}
|
|
return nil, errors.New("no Pull Request provider implementation configured")
|
|
}
|
|
|
|
func (g *PullRequestGenerator) github(ctx context.Context, cfg *argoprojiov1alpha1.PullRequestGeneratorGithub, applicationSetInfo *argoprojiov1alpha1.ApplicationSet) (pullrequest.PullRequestService, error) {
|
|
httpClient := g.newSCMHTTPClient()
|
|
if g.enableGitHubAPIMetrics {
|
|
metricsCtx := &services.MetricsContext{
|
|
AppSetNamespace: applicationSetInfo.Namespace,
|
|
AppSetName: applicationSetInfo.Name,
|
|
}
|
|
httpClient = services.NewGitHubMetricsClientFrom(httpClient, metricsCtx)
|
|
}
|
|
|
|
// use an app if it was configured
|
|
if cfg.AppSecretName != "" {
|
|
auth, err := g.GitHubApps.GetAuthSecret(ctx, cfg.AppSecretName)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error getting GitHub App secret: %w", err)
|
|
}
|
|
return pullrequest.NewGithubAppService(ctx, *auth, cfg.API, cfg.Owner, cfg.Repo, cfg.Labels, httpClient)
|
|
}
|
|
|
|
// always default to token, even if not set (public access)
|
|
token, err := utils.GetSecretRef(ctx, g.client, cfg.TokenRef, applicationSetInfo.Namespace, g.tokenRefStrictMode)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error fetching Secret token: %w", err)
|
|
}
|
|
return pullrequest.NewGithubService(token, cfg.API, cfg.Owner, cfg.Repo, cfg.Labels, httpClient)
|
|
}
|