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]>
201 lines
8.7 KiB
Go
201 lines
8.7 KiB
Go
package admin
|
|
|
|
import (
|
|
stderrors "errors"
|
|
"os"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/spf13/cobra"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/client-go/kubernetes/fake"
|
|
|
|
cmdutil "github.com/hanzoai/deploy/cmd/util"
|
|
"github.com/hanzoai/deploy/common"
|
|
"github.com/hanzoai/deploy/util/cli"
|
|
"github.com/hanzoai/deploy/util/db"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
"github.com/hanzoai/deploy/util/git"
|
|
"github.com/hanzoai/deploy/util/settings"
|
|
)
|
|
|
|
const (
|
|
ArgoCDNamespace = "argocd"
|
|
repoSecretPrefix = "repo"
|
|
)
|
|
|
|
func NewRepoCommand() *cobra.Command {
|
|
command := &cobra.Command{
|
|
Use: "repo",
|
|
Short: "Manage repositories configuration",
|
|
Run: func(c *cobra.Command, args []string) {
|
|
c.HelpFunc()(c, args)
|
|
},
|
|
}
|
|
command.AddCommand(NewGenRepoSpecCommand())
|
|
|
|
return command
|
|
}
|
|
|
|
func NewGenRepoSpecCommand() *cobra.Command {
|
|
var (
|
|
repoOpts cmdutil.RepoOptions
|
|
outputFormat string
|
|
)
|
|
|
|
// For better readability and easier formatting
|
|
repoAddExamples := `
|
|
# Add a Git repository via SSH using a private key for authentication, ignoring the server's host key:
|
|
argocd admin repo generate-spec [email protected]:repos/repo --insecure-ignore-host-key --ssh-private-key-path ~/id_rsa
|
|
|
|
# Add a Git repository via SSH on a non-default port - need to use ssh:// style URLs here
|
|
argocd admin repo generate-spec ssh://[email protected]:2222/repos/repo --ssh-private-key-path ~/id_rsa
|
|
|
|
# Add a private Git repository via HTTPS using username/password and TLS client certificates:
|
|
argocd admin repo generate-spec https://git.example.com/repos/repo --username git --password secret --tls-client-cert-path ~/mycert.crt --tls-client-cert-key-path ~/mycert.key
|
|
|
|
# Add a private Git BitBucket Data Center repository via HTTPS using bearer token:
|
|
argocd admin repo generate-spec https://bitbucket.example.com/scm/proj/repo --bearer-token secret-token
|
|
|
|
# Add a private Git repository via HTTPS using username/password without verifying the server's TLS certificate
|
|
argocd admin repo generate-spec https://git.example.com/repos/repo --username git --password secret --insecure-skip-server-verification
|
|
|
|
# Add a public Helm repository named 'stable' via HTTPS
|
|
argocd admin repo generate-spec https://charts.helm.sh/stable --type helm --name stable
|
|
|
|
# Add a private Helm repository named 'stable' via HTTPS
|
|
argocd admin repo generate-spec https://charts.helm.sh/stable --type helm --name stable --username test --password test
|
|
|
|
# Add a private Helm OCI-based repository named 'stable' via HTTPS
|
|
argocd admin repo generate-spec helm-oci-registry.cn-zhangjiakou.cr.aliyuncs.com --type helm --name stable --enable-oci --username test --password test
|
|
|
|
# Add a private HTTPS OCI repository named 'stable'
|
|
argocd admin repo generate-spec oci://helm-oci-registry.cn-zhangjiakou.cr.aliyuncs.com --type oci --name stable --username test --password test
|
|
|
|
# Add a private OCI repository named 'stable' without verifying the server's TLS certificate
|
|
argocd admin repo generate-spec oci://helm-oci-registry.cn-zhangjiakou.cr.aliyuncs.com --type oci --name stable --username test --password test --insecure-skip-server-verification
|
|
|
|
# Add a private HTTP OCI repository named 'stable'
|
|
argocd admin repo generate-spec oci://helm-oci-registry.cn-zhangjiakou.cr.aliyuncs.com --type oci --name stable --username test --password test --insecure-oci-force-http
|
|
|
|
# Add a private Git repository on GitHub.com via GitHub App. github-app-installation-id is optional, if not provided, the installation id will be fetched from the GitHub API.
|
|
argocd admin repo generate-spec https://git.example.com/repos/repo --github-app-id 1 --github-app-installation-id 2 --github-app-private-key-path test.private-key.pem
|
|
|
|
# Add a private Git repository on GitHub Enterprise via GitHub App. github-app-installation-id is optional, if not provided, the installation id will be fetched from the GitHub API.
|
|
argocd admin repo generate-spec https://ghe.example.com/repos/repo --github-app-id 1 --github-app-installation-id 2 --github-app-private-key-path test.private-key.pem --github-app-enterprise-base-url https://ghe.example.com/api/v3
|
|
|
|
# Add a private Git repository on Google Cloud Sources via GCP service account credentials
|
|
argocd admin repo generate-spec https://source.developers.google.com/p/my-google-cloud-project/r/my-repo --gcp-service-account-key-path service-account-key.json
|
|
`
|
|
|
|
command := &cobra.Command{
|
|
Use: "generate-spec REPOURL",
|
|
Short: "Generate declarative config for a repo",
|
|
Example: repoAddExamples,
|
|
Run: func(c *cobra.Command, args []string) {
|
|
ctx := c.Context()
|
|
|
|
log.SetLevel(log.WarnLevel)
|
|
if len(args) != 1 {
|
|
c.HelpFunc()(c, args)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// Repository URL
|
|
repoOpts.Repo.Repo = args[0]
|
|
|
|
// Specifying ssh-private-key-path is only valid for SSH repositories
|
|
if repoOpts.SshPrivateKeyPath != "" {
|
|
if ok, _ := git.IsSSHURL(repoOpts.Repo.Repo); ok {
|
|
keyData, err := os.ReadFile(repoOpts.SshPrivateKeyPath)
|
|
if err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
repoOpts.Repo.SSHPrivateKey = string(keyData)
|
|
} else {
|
|
err := stderrors.New("--ssh-private-key-path is only supported for SSH repositories")
|
|
errors.CheckError(err)
|
|
}
|
|
}
|
|
|
|
// tls-client-cert-path and tls-client-cert-key-key-path must always be
|
|
// specified together
|
|
if (repoOpts.TlsClientCertPath != "" && repoOpts.TlsClientCertKeyPath == "") || (repoOpts.TlsClientCertPath == "" && repoOpts.TlsClientCertKeyPath != "") {
|
|
err := stderrors.New("--tls-client-cert-path and --tls-client-cert-key-path must be specified together")
|
|
errors.CheckError(err)
|
|
}
|
|
|
|
// Specifying tls-client-cert-path is only valid for HTTPS repositories
|
|
if repoOpts.TlsClientCertPath != "" {
|
|
if git.IsHTTPSURL(repoOpts.Repo.Repo) {
|
|
tlsCertData, err := os.ReadFile(repoOpts.TlsClientCertPath)
|
|
errors.CheckError(err)
|
|
tlsCertKey, err := os.ReadFile(repoOpts.TlsClientCertKeyPath)
|
|
errors.CheckError(err)
|
|
repoOpts.Repo.TLSClientCertData = string(tlsCertData)
|
|
repoOpts.Repo.TLSClientCertKey = string(tlsCertKey)
|
|
} else {
|
|
err := stderrors.New("--tls-client-cert-path is only supported for HTTPS repositories")
|
|
errors.CheckError(err)
|
|
}
|
|
}
|
|
|
|
// Set repository connection properties only when creating repository, not
|
|
// when creating repository credentials.
|
|
// InsecureIgnoreHostKey is deprecated and only here for backwards compat
|
|
repoOpts.Repo.InsecureIgnoreHostKey = repoOpts.InsecureIgnoreHostKey
|
|
repoOpts.Repo.Insecure = repoOpts.InsecureSkipServerVerification
|
|
repoOpts.Repo.EnableLFS = repoOpts.EnableLfs
|
|
repoOpts.Repo.EnableOCI = repoOpts.EnableOci
|
|
repoOpts.Repo.UseAzureWorkloadIdentity = repoOpts.UseAzureWorkloadIdentity
|
|
repoOpts.Repo.InsecureOCIForceHttp = repoOpts.InsecureOCIForceHTTP
|
|
repoOpts.Repo.WebhookManifestCacheWarmDisabled = repoOpts.WebhookManifestCacheWarmDisabled
|
|
|
|
if repoOpts.Repo.Type == "helm" && repoOpts.Repo.Name == "" {
|
|
errors.CheckError(stderrors.New("must specify --name for repos of type 'helm'"))
|
|
}
|
|
|
|
// If the user set a username, but didn't supply password via --password,
|
|
// then we prompt for it
|
|
if repoOpts.Repo.Username != "" && repoOpts.Repo.Password == "" {
|
|
repoOpts.Repo.Password = cli.PromptPassword(repoOpts.Repo.Password)
|
|
}
|
|
|
|
err := cmdutil.ValidateBearerTokenAndPasswordCombo(repoOpts.Repo.BearerToken, repoOpts.Repo.Password)
|
|
errors.CheckError(err)
|
|
err = cmdutil.ValidateBearerTokenForHTTPSRepoOnly(repoOpts.Repo.BearerToken, git.IsHTTPSURL(repoOpts.Repo.Repo))
|
|
errors.CheckError(err)
|
|
err = cmdutil.ValidateBearerTokenForGitOnly(repoOpts.Repo.BearerToken, repoOpts.Repo.Type)
|
|
errors.CheckError(err)
|
|
|
|
argoCDCM := &corev1.ConfigMap{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "ConfigMap",
|
|
APIVersion: "v1",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: common.ArgoCDConfigMapName,
|
|
Namespace: ArgoCDNamespace,
|
|
Labels: map[string]string{
|
|
"app.kubernetes.io/part-of": "argocd",
|
|
},
|
|
},
|
|
}
|
|
kubeClientset := fake.NewClientset(argoCDCM)
|
|
settingsMgr := settings.NewSettingsManager(ctx, kubeClientset, ArgoCDNamespace)
|
|
argoDB := db.NewDB(ArgoCDNamespace, settingsMgr, kubeClientset)
|
|
|
|
_, err = argoDB.CreateRepository(ctx, &repoOpts.Repo)
|
|
errors.CheckError(err)
|
|
|
|
secret, err := kubeClientset.CoreV1().Secrets(ArgoCDNamespace).Get(ctx, db.RepoURLToSecretName(repoSecretPrefix, repoOpts.Repo.Repo, repoOpts.Repo.Project), metav1.GetOptions{})
|
|
errors.CheckError(err)
|
|
|
|
errors.CheckError(PrintResources(outputFormat, os.Stdout, secret))
|
|
},
|
|
}
|
|
command.Flags().StringVarP(&outputFormat, "output", "o", "yaml", "Output format. One of: json|yaml")
|
|
cmdutil.AddRepoFlags(command, &repoOpts)
|
|
return command
|
|
}
|