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]>
248 lines
8.3 KiB
Go
248 lines
8.3 KiB
Go
package admin
|
|
|
|
import (
|
|
"context"
|
|
stderrors "errors"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
cmdutil "github.com/hanzoai/deploy/cmd/util"
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
appclientset "github.com/hanzoai/deploy/pkg/client/clientset/versioned"
|
|
appclient "github.com/hanzoai/deploy/pkg/client/clientset/versioned/typed/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/cli"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
utilio "github.com/hanzoai/deploy/util/io"
|
|
"github.com/hanzoai/deploy/util/templates"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/utils/kube"
|
|
"github.com/spf13/cobra"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/client-go/tools/clientcmd"
|
|
)
|
|
|
|
func NewProjectsCommand() *cobra.Command {
|
|
command := &cobra.Command{
|
|
Use: "proj",
|
|
Short: "Manage projects configuration",
|
|
Run: func(c *cobra.Command, args []string) {
|
|
c.HelpFunc()(c, args)
|
|
},
|
|
}
|
|
|
|
command.AddCommand(NewGenProjectSpecCommand())
|
|
command.AddCommand(NewUpdatePolicyRuleCommand())
|
|
command.AddCommand(NewProjectAllowListGenCommand())
|
|
return command
|
|
}
|
|
|
|
// NewGenProjectSpecCommand generates declarative configuration file for given project
|
|
func NewGenProjectSpecCommand() *cobra.Command {
|
|
var (
|
|
opts cmdutil.ProjectOpts
|
|
fileURL string
|
|
outputFormat string
|
|
inline bool
|
|
)
|
|
command := &cobra.Command{
|
|
Use: "generate-spec PROJECT",
|
|
Short: "Generate declarative config for a project",
|
|
Example: templates.Examples(`
|
|
# Generate a YAML configuration for a project named "myproject"
|
|
argocd admin proj generate-spec myproject
|
|
|
|
# Generate a JSON configuration for a project named "anotherproject" and specify an output file
|
|
argocd admin proj generate-spec anotherproject --output json --file config.json
|
|
|
|
# Generate a YAML configuration for a project named "someproject" and write it back to the input file
|
|
argocd admin proj generate-spec someproject --inline
|
|
`),
|
|
|
|
Run: func(c *cobra.Command, args []string) {
|
|
proj, err := cmdutil.ConstructAppProj(fileURL, args, opts, c)
|
|
errors.CheckError(err)
|
|
|
|
out, closer, err := getOutWriter(inline, fileURL)
|
|
errors.CheckError(err)
|
|
defer utilio.Close(closer)
|
|
|
|
errors.CheckError(PrintResources(outputFormat, out, proj))
|
|
},
|
|
}
|
|
command.Flags().StringVarP(&outputFormat, "output", "o", "yaml", "Output format. One of: json|yaml")
|
|
command.Flags().StringVarP(&fileURL, "file", "f", "", "Filename or URL to Kubernetes manifests for the project")
|
|
command.Flags().BoolVarP(&inline, "inline", "i", false, "If set then generated resource is written back to the file specified in --file flag")
|
|
|
|
// Only complete files with appropriate extension.
|
|
err := command.Flags().SetAnnotation("file", cobra.BashCompFilenameExt, []string{"json", "yaml", "yml"})
|
|
errors.CheckError(err)
|
|
|
|
cmdutil.AddProjFlags(command, &opts)
|
|
return command
|
|
}
|
|
|
|
func globMatch(pattern string, val string) bool {
|
|
if pattern == "*" {
|
|
return true
|
|
}
|
|
if ok, err := filepath.Match(pattern, val); ok && err == nil {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
func getModification(modification string, resource string, scope string, permission string) (func(string, string) string, error) {
|
|
switch modification {
|
|
case "set":
|
|
if scope == "" {
|
|
return nil, stderrors.New("flag --group cannot be empty if permission should be set in role")
|
|
}
|
|
if permission == "" {
|
|
return nil, stderrors.New("flag --permission cannot be empty if permission should be set in role")
|
|
}
|
|
return func(proj string, action string) string {
|
|
return fmt.Sprintf("%s, %s, %s/%s, %s", resource, action, proj, scope, permission)
|
|
}, nil
|
|
case "remove":
|
|
return func(_ string, _ string) string {
|
|
return ""
|
|
}, nil
|
|
}
|
|
return nil, fmt.Errorf("modification %s is not supported", modification)
|
|
}
|
|
|
|
func saveProject(ctx context.Context, updated v1alpha1.AppProject, orig v1alpha1.AppProject, projectsIf appclient.AppProjectInterface, dryRun bool) error {
|
|
fmt.Printf("===== %s ======\n", updated.Name)
|
|
target, err := kube.ToUnstructured(&updated)
|
|
errors.CheckError(err)
|
|
live, err := kube.ToUnstructured(&orig)
|
|
if err != nil {
|
|
return fmt.Errorf("error converting project to unstructured: %w", err)
|
|
}
|
|
_ = cli.PrintDiff(updated.Name, target, live)
|
|
if !dryRun {
|
|
_, err = projectsIf.Update(ctx, &updated, metav1.UpdateOptions{})
|
|
if err != nil {
|
|
return fmt.Errorf("error while updating project: %w", err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func formatPolicy(proj string, role string, permission string) string {
|
|
return fmt.Sprintf("p, proj:%s:%s, %s", proj, role, permission)
|
|
}
|
|
|
|
func split(input string, delimiter string) []string {
|
|
parts := strings.Split(input, delimiter)
|
|
for i := range parts {
|
|
parts[i] = strings.TrimSpace(parts[i])
|
|
}
|
|
return parts
|
|
}
|
|
|
|
func NewUpdatePolicyRuleCommand() *cobra.Command {
|
|
var (
|
|
clientConfig clientcmd.ClientConfig
|
|
resource string
|
|
scope string
|
|
rolePattern string
|
|
permission string
|
|
dryRun bool
|
|
)
|
|
command := &cobra.Command{
|
|
Use: "update-role-policy PROJECT_GLOB MODIFICATION ACTION",
|
|
Short: "Implement bulk project role update. Useful to back-fill existing project policies or remove obsolete actions.",
|
|
Example: ` # Add policy that allows executing any action (action/*) to roles which name matches to *deployer* in all projects
|
|
argocd admin proj update-role-policy '*' set 'action/*' --role '*deployer*' --resource applications --scope '*' --permission allow
|
|
|
|
# Remove policy that which manages running (action/*) from all roles which name matches *deployer* in all projects
|
|
argocd admin proj update-role-policy '*' remove override --role '*deployer*'
|
|
`,
|
|
Run: func(c *cobra.Command, args []string) {
|
|
ctx := c.Context()
|
|
|
|
if len(args) != 3 {
|
|
c.HelpFunc()(c, args)
|
|
os.Exit(1)
|
|
}
|
|
projectGlob := args[0]
|
|
modificationType := args[1]
|
|
action := args[2]
|
|
|
|
config, err := clientConfig.ClientConfig()
|
|
errors.CheckError(err)
|
|
config.QPS = 100
|
|
config.Burst = 50
|
|
|
|
namespace, _, err := clientConfig.Namespace()
|
|
errors.CheckError(err)
|
|
appclients := appclientset.NewForConfigOrDie(config)
|
|
|
|
modification, err := getModification(modificationType, resource, scope, permission)
|
|
errors.CheckError(err)
|
|
projIf := appclients.ArgoprojV1alpha1().AppProjects(namespace)
|
|
|
|
err = updateProjects(ctx, projIf, projectGlob, rolePattern, action, modification, dryRun)
|
|
errors.CheckError(err)
|
|
},
|
|
}
|
|
command.Flags().StringVar(&resource, "resource", "", "Resource e.g. 'applications'")
|
|
command.Flags().StringVar(&scope, "scope", "", "Resource scope e.g. '*'")
|
|
command.Flags().StringVar(&rolePattern, "role", "*", "Role name pattern e.g. '*deployer*'")
|
|
command.Flags().StringVar(&permission, "permission", "", "Action permission")
|
|
command.Flags().BoolVar(&dryRun, "dry-run", true, "Dry run")
|
|
clientConfig = cli.AddKubectlFlagsToCmd(command)
|
|
return command
|
|
}
|
|
|
|
func updateProjects(ctx context.Context, projIf appclient.AppProjectInterface, projectGlob string, rolePattern string, action string, modification func(string, string) string, dryRun bool) error {
|
|
projects, err := projIf.List(ctx, metav1.ListOptions{})
|
|
if err != nil {
|
|
return fmt.Errorf("error listing the projects: %w", err)
|
|
}
|
|
for _, proj := range projects.Items {
|
|
if !globMatch(projectGlob, proj.Name) {
|
|
continue
|
|
}
|
|
origProj := proj.DeepCopy()
|
|
updated := false
|
|
for i, role := range proj.Spec.Roles {
|
|
if !globMatch(rolePattern, role.Name) {
|
|
continue
|
|
}
|
|
actionPolicyIndex := -1
|
|
for i := range role.Policies {
|
|
parts := split(role.Policies[i], ",")
|
|
if len(parts) != 6 || parts[3] != action {
|
|
continue
|
|
}
|
|
actionPolicyIndex = i
|
|
break
|
|
}
|
|
policyPermission := modification(proj.Name, action)
|
|
switch {
|
|
case actionPolicyIndex == -1 && policyPermission != "":
|
|
updated = true
|
|
role.Policies = append(role.Policies, formatPolicy(proj.Name, role.Name, policyPermission))
|
|
case actionPolicyIndex > -1 && policyPermission == "":
|
|
updated = true
|
|
role.Policies = append(role.Policies[:actionPolicyIndex], role.Policies[actionPolicyIndex+1:]...)
|
|
case actionPolicyIndex > -1 && policyPermission != "":
|
|
updated = true
|
|
role.Policies[actionPolicyIndex] = formatPolicy(proj.Name, role.Name, policyPermission)
|
|
}
|
|
proj.Spec.Roles[i] = role
|
|
}
|
|
if updated {
|
|
err = saveProject(ctx, proj, *origProj, projIf, dryRun)
|
|
if err != nil {
|
|
return fmt.Errorf("error saving the project: %w", err)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|