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]>
358 lines
11 KiB
Go
358 lines
11 KiB
Go
package repos
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
"github.com/hanzoai/deploy/test/e2e/fixture"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
)
|
|
|
|
func CertPath(t *testing.T) string {
|
|
t.Helper()
|
|
return mustToAbsPath(t, "../fixture/certs/argocd-test-client.crt")
|
|
}
|
|
|
|
func CertKeyPath(t *testing.T) string {
|
|
t.Helper()
|
|
return mustToAbsPath(t, "../fixture/certs/argocd-test-client.key")
|
|
}
|
|
|
|
func mustToAbsPath(t *testing.T, relativePath string) string {
|
|
t.Helper()
|
|
res, err := filepath.Abs(relativePath)
|
|
require.NoError(t, err)
|
|
return res
|
|
}
|
|
|
|
type AddRepoOpts func(args []string) []string
|
|
|
|
func WithDepth(depth int64) AddRepoOpts {
|
|
return func(args []string) []string {
|
|
if depth > 0 {
|
|
args = append(args, "--depth", strconv.FormatInt(depth, 10))
|
|
}
|
|
return args
|
|
}
|
|
}
|
|
|
|
func applyOpts(args []string, opts []AddRepoOpts) []string {
|
|
for _, opt := range opts {
|
|
args = opt(args)
|
|
}
|
|
return args
|
|
}
|
|
|
|
// sets the current repo as the default SSH test repo
|
|
func AddSSHRepo(t *testing.T, insecure bool, credentials bool, repoURLType fixture.RepoURLType, opts ...AddRepoOpts) {
|
|
t.Helper()
|
|
keyPath, err := filepath.Abs("../fixture/testrepos/id_rsa")
|
|
require.NoError(t, err)
|
|
args := []string{"repo", "add", fixture.RepoURL(repoURLType)}
|
|
if credentials {
|
|
args = append(args, "--ssh-private-key-path", keyPath)
|
|
}
|
|
if insecure {
|
|
args = append(args, "--insecure-ignore-host-key")
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(applyOpts(args, opts)...))
|
|
}
|
|
|
|
// sets the current repo as the default HTTPS test repo
|
|
func AddHTTPSRepo(t *testing.T, insecure bool, credentials bool, project string, repoURLType fixture.RepoURLType, opts ...AddRepoOpts) {
|
|
t.Helper()
|
|
// This construct is somewhat necessary to satisfy the compiler
|
|
args := []string{"repo", "add", fixture.RepoURL(repoURLType)}
|
|
if credentials {
|
|
args = append(args, "--username", fixture.GitUsername, "--password", fixture.GitPassword)
|
|
}
|
|
if insecure {
|
|
args = append(args, "--insecure-skip-server-verification")
|
|
}
|
|
if project != "" {
|
|
args = append(args, "--project", project)
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(applyOpts(args, opts)...))
|
|
}
|
|
|
|
// sets a HTTPS repo using TLS client certificate authentication
|
|
func AddHTTPSRepoClientCert(t *testing.T, insecure bool) {
|
|
t.Helper()
|
|
args := []string{
|
|
"repo",
|
|
"add",
|
|
fixture.RepoURL(fixture.RepoURLTypeHTTPSClientCert),
|
|
"--username", fixture.GitUsername,
|
|
"--password", fixture.GitPassword,
|
|
"--tls-client-cert-path", CertPath(t),
|
|
"--tls-client-cert-key-path", CertKeyPath(t),
|
|
}
|
|
if insecure {
|
|
args = append(args, "--insecure-skip-server-verification")
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
func AddHelmRepo(t *testing.T, name string) {
|
|
t.Helper()
|
|
args := []string{
|
|
"repo",
|
|
"add",
|
|
fixture.RepoURL(fixture.RepoURLTypeHelm),
|
|
"--username", fixture.GitUsername,
|
|
"--password", fixture.GitPassword,
|
|
"--tls-client-cert-path", CertPath(t),
|
|
"--tls-client-cert-key-path", CertKeyPath(t),
|
|
"--type", "helm",
|
|
"--name", name,
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
func AddOCIRepo(t *testing.T, name, imagePath string) {
|
|
t.Helper()
|
|
args := []string{
|
|
"repo",
|
|
"add",
|
|
fmt.Sprintf("%s/%s", fixture.OCIHostURL, imagePath),
|
|
"--type", "oci",
|
|
"--name", name,
|
|
"--insecure-oci-force-http",
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
func AddAuthenticatedOCIRepo(t *testing.T, name, imagePath string) {
|
|
t.Helper()
|
|
args := []string{
|
|
"repo",
|
|
"add",
|
|
fmt.Sprintf("%s/%s", fixture.AuthenticatedOCIHostURL, imagePath),
|
|
"--username", fixture.GitUsername,
|
|
"--password", fixture.GitPassword,
|
|
"--type", "oci",
|
|
"--name", name,
|
|
"--insecure-oci-force-http",
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
func AddHelmOCIRepo(t *testing.T, name string) {
|
|
t.Helper()
|
|
args := []string{
|
|
"repo",
|
|
"add",
|
|
fixture.HelmOCIRegistryURL,
|
|
"--type", "helm",
|
|
"--name", name,
|
|
"--enable-oci",
|
|
"--insecure-oci-force-http",
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
// AddHTTPSRepoCredentialsUserPass adds E2E username/password credentials for HTTPS repos to context
|
|
func AddHTTPSCredentialsUserPass(t *testing.T) {
|
|
t.Helper()
|
|
var repoURLType fixture.RepoURLType = fixture.RepoURLTypeHTTPS
|
|
args := []string{"repocreds", "add", fixture.RepoURL(repoURLType), "--username", fixture.GitUsername, "--password", fixture.GitPassword}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
// AddHTTPSRepoCredentialsTLSClientCert adds E2E for HTTPS repos to context
|
|
func AddHTTPSCredentialsTLSClientCert(t *testing.T) {
|
|
t.Helper()
|
|
certPath, err := filepath.Abs("../fixture/certs/argocd-test-client.crt")
|
|
require.NoError(t, err)
|
|
keyPath, err := filepath.Abs("../fixture/certs/argocd-test-client.key")
|
|
require.NoError(t, err)
|
|
args := []string{
|
|
"repocreds",
|
|
"add",
|
|
fixture.RepoBaseURL(fixture.RepoURLTypeHTTPSClientCert),
|
|
"--username", fixture.GitUsername,
|
|
"--password", fixture.GitPassword,
|
|
"--tls-client-cert-path", certPath,
|
|
"--tls-client-cert-key-path", keyPath,
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
// AddHelmHTTPSCredentialsTLSClientCert adds credentials for Helm repos to context
|
|
func AddHelmHTTPSCredentialsTLSClientCert(t *testing.T) {
|
|
t.Helper()
|
|
certPath, err := filepath.Abs("../fixture/certs/argocd-test-client.crt")
|
|
require.NoError(t, err)
|
|
keyPath, err := filepath.Abs("../fixture/certs/argocd-test-client.key")
|
|
require.NoError(t, err)
|
|
args := []string{
|
|
"repocreds",
|
|
"add",
|
|
fixture.RepoURL(fixture.RepoURLTypeHelmParent),
|
|
"--username", fixture.GitUsername,
|
|
"--password", fixture.GitPassword,
|
|
"--tls-client-cert-path", certPath,
|
|
"--tls-client-cert-key-path", keyPath,
|
|
"--type", "helm",
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
// AddHelmoOCICredentialsWithoutUserPass adds credentials for Helm OIC repo to context
|
|
func AddHelmoOCICredentialsWithoutUserPass(t *testing.T) {
|
|
t.Helper()
|
|
args := []string{
|
|
"repocreds", "add", fixture.RepoURL(fixture.RepoURLTypeHelmOCI),
|
|
"--enable-oci", "--type", "helm", "--insecure-oci-force-http",
|
|
}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
// AddSSHRepoCredentials adds E2E fixture credentials for SSH repos to context
|
|
func AddSSHCredentials(t *testing.T) {
|
|
t.Helper()
|
|
keyPath, err := filepath.Abs("../fixture/testrepos/id_rsa")
|
|
require.NoError(t, err)
|
|
var repoURLType fixture.RepoURLType = fixture.RepoURLTypeSSH
|
|
args := []string{"repocreds", "add", fixture.RepoBaseURL(repoURLType), "--ssh-private-key-path", keyPath}
|
|
errors.NewHandler(t).FailOnErr(fixture.RunCli(args...))
|
|
}
|
|
|
|
// PushChartToOCIRegistry adds a helm chart to helm OCI registry
|
|
func PushChartToOCIRegistry(t *testing.T, chartPathName, chartName, chartVersion string) {
|
|
t.Helper()
|
|
// create empty temp directory to extract chart from the registry
|
|
tempDest, err1 := os.MkdirTemp("", "helm")
|
|
require.NoError(t, err1)
|
|
defer func() { _ = os.RemoveAll(tempDest) }()
|
|
|
|
chartAbsPath, err2 := filepath.Abs("./" + chartPathName)
|
|
require.NoError(t, err2)
|
|
|
|
errors.NewHandler(t).FailOnErr(fixture.Run("", "helm", "dependency", "build", "--plain-http", chartAbsPath))
|
|
errors.NewHandler(t).FailOnErr(fixture.Run("", "helm", "package", chartAbsPath, "--destination", tempDest))
|
|
_ = os.RemoveAll(fmt.Sprintf("%s/%s", chartAbsPath, "charts"))
|
|
errors.NewHandler(t).FailOnErr(fixture.Run(
|
|
"",
|
|
"helm",
|
|
"push",
|
|
"--plain-http",
|
|
fmt.Sprintf("%s/%s-%s.tgz", tempDest, chartName, chartVersion),
|
|
"oci://"+fixture.HelmOCIRegistryURL,
|
|
))
|
|
}
|
|
|
|
// PushChartToAuthenticatedOCIRegistry adds a helm chart to helm OCI registry
|
|
func PushChartToAuthenticatedOCIRegistry(t *testing.T, chartPathName, chartName, chartVersion string) {
|
|
t.Helper()
|
|
// create empty temp directory to extract chart from the registry
|
|
tempDest, err1 := os.MkdirTemp("", "helm")
|
|
require.NoError(t, err1)
|
|
defer func() { _ = os.RemoveAll(tempDest) }()
|
|
|
|
chartAbsPath, err2 := filepath.Abs("./" + chartPathName)
|
|
require.NoError(t, err2)
|
|
|
|
errors.NewHandler(t).FailOnErr(fixture.Run("", "helm", "dependency", "build", "--plain-http", chartAbsPath))
|
|
errors.NewHandler(t).FailOnErr(fixture.Run("", "helm", "package", chartAbsPath, "--destination", tempDest))
|
|
_ = os.RemoveAll(fmt.Sprintf("%s/%s", chartAbsPath, "charts"))
|
|
|
|
errors.NewHandler(t).FailOnErr(fixture.Run(
|
|
"",
|
|
"helm",
|
|
"registry",
|
|
"login",
|
|
"--plain-http",
|
|
"--username", fixture.GitUsername,
|
|
"--password", fixture.GitPassword,
|
|
"localhost:5001",
|
|
))
|
|
|
|
errors.NewHandler(t).FailOnErr(fixture.Run(
|
|
"",
|
|
"helm",
|
|
"push",
|
|
"--plain-http",
|
|
fmt.Sprintf("%s/%s-%s.tgz", tempDest, chartName, chartVersion),
|
|
"oci://"+fixture.HelmAuthenticatedOCIRegistryURL,
|
|
))
|
|
|
|
errors.NewHandler(t).FailOnErr(fixture.Run(
|
|
"",
|
|
"helm",
|
|
"registry",
|
|
"logout",
|
|
"localhost:5001",
|
|
))
|
|
}
|
|
|
|
// PushImageToOCIRegistry adds a helm chart to helm OCI registry
|
|
func PushImageToOCIRegistry(t *testing.T, pathName, tag string) {
|
|
t.Helper()
|
|
imagePath := "./" + pathName
|
|
|
|
errors.NewHandler(t).FailOnErr(fixture.Run(
|
|
imagePath,
|
|
"oras",
|
|
"push",
|
|
fmt.Sprintf("%s:%s", fmt.Sprintf("%s/%s", strings.TrimPrefix(fixture.OCIHostURL, "oci://"), filepath.Base(pathName)), tag),
|
|
".",
|
|
))
|
|
}
|
|
|
|
// PushImageToAuthenticatedOCIRegistry adds a helm chart to helm OCI registry
|
|
func PushImageToAuthenticatedOCIRegistry(t *testing.T, pathName, tag string) {
|
|
t.Helper()
|
|
imagePath := "./" + pathName
|
|
|
|
errors.NewHandler(t).FailOnErr(fixture.Run(
|
|
imagePath,
|
|
"oras",
|
|
"push",
|
|
fmt.Sprintf("%s:%s", fmt.Sprintf("%s/%s", strings.TrimPrefix(fixture.AuthenticatedOCIHostURL, "oci://"), filepath.Base(pathName)), tag),
|
|
".",
|
|
))
|
|
}
|
|
|
|
// AddWriteCredentials adds write credentials for a repository.
|
|
// Write credentials are used by the commit-server to push hydrated manifests back to the repository.
|
|
// TODO: add CLI support for managing write credentials and use that here instead.
|
|
func AddWriteCredentials(t *testing.T, name string, insecure bool, repoURLType fixture.RepoURLType) {
|
|
t.Helper()
|
|
repoURL := fixture.RepoURL(repoURLType)
|
|
|
|
// Create a Kubernetes secret with the repository-write label
|
|
// Replace invalid characters for secret name
|
|
secretName := "write-creds-" + name
|
|
|
|
_, err := fixture.KubeClientset.CoreV1().Secrets(fixture.ArgoCDNamespace).Create(
|
|
context.Background(),
|
|
&corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: secretName,
|
|
Labels: map[string]string{
|
|
common.LabelKeySecretType: common.LabelValueSecretTypeRepositoryWrite,
|
|
},
|
|
},
|
|
StringData: map[string]string{
|
|
"url": repoURL,
|
|
"username": fixture.GitUsername,
|
|
"password": fixture.GitPassword,
|
|
"insecure": strconv.FormatBool(insecure),
|
|
},
|
|
},
|
|
metav1.CreateOptions{},
|
|
)
|
|
require.NoError(t, err)
|
|
}
|