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]>
376 lines
12 KiB
Go
376 lines
12 KiB
Go
package e2e
|
|
|
|
import (
|
|
"strconv"
|
|
"testing"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/health"
|
|
. "github.com/hanzoai/deploy/gitops-engine/pkg/sync/common"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
. "github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/test/e2e/fixture"
|
|
. "github.com/hanzoai/deploy/test/e2e/fixture/app"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
)
|
|
|
|
func TestKustomize2AppSource(t *testing.T) {
|
|
ctx := Given(t)
|
|
patchLabelMatchesFor := func(kind string) func(app *Application) {
|
|
return func(_ *Application) {
|
|
name := "k2-patched-guestbook-ui-deploy1"
|
|
labelValue, err := fixture.Run(
|
|
"", "kubectl", "-n="+ctx.DeploymentNamespace(),
|
|
"get", kind, name,
|
|
"-ojsonpath={.metadata.labels.patched-by}")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "argo-cd", labelValue, "wrong value of 'patched-by' label of %s %s", kind, name)
|
|
}
|
|
}
|
|
|
|
ctx.
|
|
Path(guestbookPath).
|
|
NamePrefix("k2-").
|
|
NameSuffix("-deploy1").
|
|
When().
|
|
CreateApp().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
When().
|
|
PatchApp(`[
|
|
{
|
|
"op": "replace",
|
|
"path": "/spec/source/kustomize/namePrefix",
|
|
"value": "k2-patched-"
|
|
},
|
|
{
|
|
"op": "add",
|
|
"path": "/spec/source/kustomize/commonLabels",
|
|
"value": {
|
|
"patched-by": "argo-cd"
|
|
}
|
|
}
|
|
]`).
|
|
Then().
|
|
Expect(Success("")).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(Success("")).
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
And(patchLabelMatchesFor("Service")).
|
|
And(patchLabelMatchesFor("Deployment"))
|
|
}
|
|
|
|
// when we have a config map generator, AND the ignore annotation, it is ignored in the app's sync status
|
|
func TestSyncStatusOptionIgnore(t *testing.T) {
|
|
var oldMap string
|
|
Given(t).
|
|
Path("kustomize-cm-gen").
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
And(func(app *Application) {
|
|
resourceStatus := app.Status.Resources[0]
|
|
assert.Contains(t, resourceStatus.Name, "my-map-")
|
|
assert.Equal(t, SyncStatusCodeSynced, resourceStatus.Status)
|
|
|
|
oldMap = resourceStatus.Name
|
|
}).
|
|
When().
|
|
// we now force generation of a second CM
|
|
PatchFile("kustomization.yaml", `[{"op": "replace", "path": "/configMapGenerator/0/literals/0", "value": "foo=baz"}]`).
|
|
Refresh(RefreshTypeHard).
|
|
Then().
|
|
// this is standard logging from the command - tough one - true statement
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
// this is a key check - we expect the app to be healthy because, even though we have a resources that needs
|
|
// pruning, because it is annotated with IgnoreExtraneous it should not contribute to the sync status
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
And(func(app *Application) {
|
|
assert.Len(t, app.Status.Resources, 2)
|
|
for _, resourceStatus := range app.Status.Resources {
|
|
// new map in-sync
|
|
if resourceStatus.Name != oldMap {
|
|
assert.Contains(t, resourceStatus.Name, "my-map-")
|
|
// make sure we've a new map with changed name
|
|
assert.Equal(t, SyncStatusCodeSynced, resourceStatus.Status)
|
|
} else {
|
|
assert.Equal(t, SyncStatusCodeOutOfSync, resourceStatus.Status)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
// make sure we can create an app which has a SSH remote base
|
|
func TestKustomizeSSHRemoteBase(t *testing.T) {
|
|
Given(t).
|
|
// not the best test, as we should have two remote repos both with the same SSH private key
|
|
SSHInsecureRepoURLAdded(true).
|
|
RepoURLType(fixture.RepoURLTypeSSH).
|
|
Path(fixture.LocalOrRemotePath("ssh-kustomize-base")).
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(ResourceSyncStatusIs("ConfigMap", "my-map", SyncStatusCodeSynced))
|
|
}
|
|
|
|
// make sure we can create an app which has a SSH remote base
|
|
func TestKustomizeDeclarativeInvalidApp(t *testing.T) {
|
|
Given(t).
|
|
Path("invalid-kustomize").
|
|
When().
|
|
Declarative("declarative-apps/app.yaml").
|
|
Then().
|
|
Expect(Success("")).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
Expect(SyncStatusIs(SyncStatusCodeUnknown)).
|
|
Expect(Condition(ApplicationConditionComparisonError, "invalid-kustomize/does-not-exist.yaml: no such file or directory"))
|
|
}
|
|
|
|
// Flag --load_restrictor is no longer supported in Kustomize 4
|
|
func TestKustomizeBuildOptionsLoadRestrictor(t *testing.T) {
|
|
Given(t).
|
|
Path(guestbookPath).
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(fixture.Run("", "kubectl", "patch", "cm", "argocd-cm",
|
|
"-n", fixture.TestNamespace(),
|
|
"-p", `{ "data": { "kustomize.buildOptions": "--load-restrictor LoadRestrictionsNone" } }`))
|
|
}).
|
|
When().
|
|
PatchFile("kustomization.yaml", `[{"op": "replace", "path": "/resources/1", "value": "../guestbook_local/guestbook-ui-svc.yaml"}]`).
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Given().
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(fixture.Run("", "kubectl", "patch", "cm", "argocd-cm",
|
|
"-n", fixture.TestNamespace(),
|
|
"-p", `{ "data": { "kustomize.buildOptions": "" } }`))
|
|
})
|
|
}
|
|
|
|
// make sure we we can invoke the CLI to replace images
|
|
func TestKustomizeImages(t *testing.T) {
|
|
Given(t).
|
|
Path("kustomize").
|
|
When().
|
|
CreateApp().
|
|
// pass two flags to check the multi flag logic works
|
|
AppSet("--kustomize-image", "alpine:foo", "--kustomize-image", "alpine:bar").
|
|
Then().
|
|
And(func(app *Application) {
|
|
assert.Contains(t, app.Spec.GetSource().Kustomize.Images, KustomizeImage("alpine:bar"))
|
|
})
|
|
}
|
|
|
|
// make sure we we can invoke the CLI to replace replicas and actual deployment is set to correct value
|
|
func TestKustomizeReplicas2AppSource(t *testing.T) {
|
|
ctx := Given(t)
|
|
deploymentName := "guestbook-ui"
|
|
deploymentReplicas := 2
|
|
checkReplicasFor := func(kind string) func(app *Application) {
|
|
return func(_ *Application) {
|
|
name := deploymentName
|
|
replicas, err := fixture.Run(
|
|
"", "kubectl", "-n="+ctx.DeploymentNamespace(),
|
|
"get", kind, name,
|
|
"-ojsonpath={.spec.replicas}")
|
|
require.NoError(t, err)
|
|
assert.Equal(t, strconv.Itoa(deploymentReplicas), replicas, "wrong value of replicas %s %s", kind, name)
|
|
}
|
|
}
|
|
|
|
ctx.
|
|
Path("guestbook").
|
|
When().
|
|
CreateApp().
|
|
AppSet("--kustomize-replica", deploymentName+"=2").
|
|
Then().
|
|
And(func(app *Application) {
|
|
assert.Equal(t, deploymentName, app.Spec.Source.Kustomize.Replicas[0].Name)
|
|
}).
|
|
And(func(app *Application) {
|
|
assert.Equal(t, deploymentReplicas, int(app.Spec.Source.Kustomize.Replicas[0].Count.IntVal))
|
|
}). // check Kustomize CLI
|
|
Expect(Success("")).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(Success("")).
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
And(checkReplicasFor("Deployment"))
|
|
}
|
|
|
|
// make sure we we can invoke the CLI to set namesuffix
|
|
func TestKustomizeNameSuffix(t *testing.T) {
|
|
Given(t).
|
|
Path("kustomize").
|
|
When().
|
|
CreateApp().
|
|
AppSet("--namesuffix", "-suf").
|
|
Then().
|
|
And(func(app *Application) {
|
|
assert.Contains(t, app.Spec.GetSource().Kustomize.NameSuffix, "-suf")
|
|
})
|
|
}
|
|
|
|
// make sure we we can invoke the CLI to set and unset namesuffix and kustomize-image
|
|
func TestKustomizeUnsetOverride(t *testing.T) {
|
|
Given(t).
|
|
Path("kustomize").
|
|
When().
|
|
CreateApp().
|
|
AppSet("--namesuffix", "-suf").
|
|
Then().
|
|
And(func(app *Application) {
|
|
assert.Contains(t, app.Spec.GetSource().Kustomize.NameSuffix, "-suf")
|
|
}).
|
|
When().
|
|
AppUnSet("--namesuffix").
|
|
Then().
|
|
And(func(app *Application) {
|
|
assert.Nil(t, app.Spec.GetSource().Kustomize)
|
|
}).
|
|
When().
|
|
AppSet("--kustomize-image", "alpine:foo", "--kustomize-image", "alpine:bar").
|
|
Then().
|
|
And(func(app *Application) {
|
|
assert.Contains(t, app.Spec.GetSource().Kustomize.Images, KustomizeImage("alpine:bar"))
|
|
}).
|
|
When().
|
|
// AppUnSet("--kustomize-image=alpine").
|
|
AppUnSet("--kustomize-image", "alpine", "--kustomize-image", "alpine").
|
|
Then().
|
|
And(func(app *Application) {
|
|
assert.Nil(t, app.Spec.GetSource().Kustomize)
|
|
})
|
|
}
|
|
|
|
// make sure we we can invoke the CLI to set and unset Deployment
|
|
func TestKustomizeUnsetOverrideDeployment(t *testing.T) {
|
|
deploymentName := "guestbook-ui"
|
|
deploymentReplicas := int32(2)
|
|
Given(t).
|
|
Path("guestbook").
|
|
When(). // Replicas
|
|
CreateApp().
|
|
AppSet("--kustomize-replica", deploymentName+"=2").
|
|
Then().
|
|
And(func(app *Application) {
|
|
assert.Equal(t, deploymentName, app.Spec.Source.Kustomize.Replicas[0].Name)
|
|
}).
|
|
And(func(app *Application) {
|
|
assert.Equal(t, deploymentReplicas, app.Spec.Source.Kustomize.Replicas[0].Count.IntVal)
|
|
}).
|
|
When().
|
|
AppUnSet("--kustomize-replica", deploymentName).
|
|
Then().
|
|
And(func(app *Application) {
|
|
assert.Nil(t, app.Spec.Source.Kustomize)
|
|
})
|
|
}
|
|
|
|
// make sure kube-version gets passed down to resources
|
|
func TestKustomizeKubeVersion(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path("kustomize-kube-version").
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(fixture.Run("", "kubectl", "patch", "cm", "argocd-cm",
|
|
"-n", fixture.TestNamespace(),
|
|
"-p", `{ "data": { "kustomize.buildOptions": "--enable-helm" } }`))
|
|
}).
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(_ *Application) {
|
|
kubeVersion := errors.NewHandler(t).FailOnErr(fixture.Run(".", "kubectl", "-n", ctx.DeploymentNamespace(), "get", "cm", "my-map",
|
|
"-o", "jsonpath={.data.kubeVersion}")).(string)
|
|
assert.LessOrEqual(t, fixture.GetVersions(t).ServerVersion.String(), kubeVersion)
|
|
}).
|
|
When().
|
|
// Make sure override works.
|
|
AppSet("--kustomize-kube-version", "999.999.999").
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(_ *Application) {
|
|
assert.Equal(t, "v999.999.999", errors.NewHandler(t).FailOnErr(fixture.Run(".", "kubectl", "-n", ctx.DeploymentNamespace(), "get", "cm", "my-map",
|
|
"-o", "jsonpath={.data.kubeVersion}")).(string))
|
|
})
|
|
}
|
|
|
|
// make sure api versions gets passed down to resources
|
|
func TestKustomizeApiVersions(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.Path("kustomize-api-versions").
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(fixture.Run("", "kubectl", "patch", "cm", "argocd-cm",
|
|
"-n", fixture.TestNamespace(),
|
|
"-p", `{ "data": { "kustomize.buildOptions": "--enable-helm" } }`))
|
|
}).
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(_ *Application) {
|
|
apiVersions := errors.NewHandler(t).FailOnErr(fixture.Run(".", "kubectl", "-n", ctx.DeploymentNamespace(), "get", "cm", "my-map",
|
|
"-o", "jsonpath={.data.apiVersions}")).(string)
|
|
// The v1 API shouldn't be going anywhere.
|
|
assert.Contains(t, apiVersions, "v1")
|
|
}).
|
|
When().
|
|
// Make sure override works.
|
|
AppSet("--kustomize-api-versions", "v1/MyTestResource").
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
And(func(_ *Application) {
|
|
apiVersions := errors.NewHandler(t).FailOnErr(fixture.Run(".", "kubectl", "-n", ctx.DeploymentNamespace(), "get", "cm", "my-map",
|
|
"-o", "jsonpath={.data.apiVersions}")).(string)
|
|
assert.Contains(t, apiVersions, "v1/MyTestResource")
|
|
})
|
|
}
|
|
|
|
func TestKustomizeNamespaceOverride(t *testing.T) {
|
|
Given(t).
|
|
Path("kustomize-kube-version").
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(fixture.Run("", "kubectl", "patch", "cm", "argocd-cm",
|
|
"-n", fixture.TestNamespace(),
|
|
"-p", `{ "data": { "kustomize.buildOptions": "--enable-helm" } }`))
|
|
}).
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
When().
|
|
AppSet("--kustomize-namespace", "does-not-exist").
|
|
Then().
|
|
// The app should stay in synced status as per https://github.com/kubernetes-sigs/kustomize/pull/5940
|
|
// the transformer will not update a helm generated namespace.
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|