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]>
274 lines
10 KiB
Go
274 lines
10 KiB
Go
package e2e
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"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"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/types"
|
|
|
|
. "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"
|
|
)
|
|
|
|
// TestSyncWithCreateNamespace verifies that the namespace is created when the
|
|
// CreateNamespace=true is provided as part of the normal sync resources
|
|
func TestSyncWithCreateNamespace(t *testing.T) {
|
|
newNamespace := getNewNamespace(t)
|
|
defer func() {
|
|
if !t.Skipped() {
|
|
errors.NewHandler(t).FailOnErr(Run("", "kubectl", "delete", "namespace", newNamespace))
|
|
}
|
|
}()
|
|
|
|
Given(t).
|
|
Path(guestbookPath).
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Destination.Namespace = newNamespace
|
|
app.Spec.SyncPolicy = &SyncPolicy{
|
|
SyncOptions: SyncOptions{
|
|
"CreateNamespace=true",
|
|
},
|
|
}
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(ResourceResultNumbering(3))
|
|
}
|
|
|
|
// TestSyncWithCreateNamespaceAndDryRunError verifies that the namespace is created before the
|
|
// DryRun validation is made on the resources, even if the sync fails. This allows transient errors
|
|
// to be resolved on sync retries
|
|
func TestSyncWithCreateNamespaceAndDryRunError(t *testing.T) {
|
|
newNamespace := getNewNamespace(t)
|
|
defer func() {
|
|
if !t.Skipped() {
|
|
errors.NewHandler(t).FailOnErr(Run("", "kubectl", "delete", "namespace", newNamespace))
|
|
}
|
|
}()
|
|
|
|
Given(t).
|
|
Path("failure-during-sync").
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Destination.Namespace = newNamespace
|
|
app.Spec.SyncPolicy = &SyncPolicy{
|
|
SyncOptions: SyncOptions{
|
|
"CreateNamespace=true",
|
|
},
|
|
}
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
When().
|
|
IgnoreErrors().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationFailed)).
|
|
Expect(ResourceResultNumbering(2)).
|
|
Expect(ResourceResultMatches(ResourceResult{Version: "v1", Kind: "Namespace", Name: newNamespace, Status: ResultCodeSynced, Message: fmt.Sprintf("namespace/%s created", newNamespace), HookPhase: OperationRunning, SyncPhase: SyncPhasePreSync})).
|
|
Expect(ResourceResultMatches(ResourceResult{Version: "v1", Kind: "ServiceAccount", Namespace: newNamespace, Name: "failure-during-sync", Status: ResultCodeSyncFailed, Message: `ServiceAccount "failure-during-sync" is invalid: metadata.labels: Invalid value`, HookPhase: OperationFailed, SyncPhase: SyncPhaseSync}))
|
|
}
|
|
|
|
// TestSyncOptionsValidateFalse verifies we can disable validation during kubectl apply, using the
|
|
// 'argocd.argoproj.io/sync-options: Validate=false' sync option
|
|
func TestSyncOptionsValidateFalse(t *testing.T) {
|
|
Given(t).
|
|
Path("sync-options-validate-false").
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded))
|
|
// NOTE: it is a bug that we do not detect this as OutOfSync. This is because we
|
|
// are dropping fields as part of remarshalling. See: https://github.com/argoproj/argo-cd/issues/1787
|
|
// Expect(SyncStatusIs(SyncStatusCodeOutOfSync))
|
|
}
|
|
|
|
// TestSyncOptionsValidateTrue verifies when 'argocd.argoproj.io/sync-options: Validate=false' is
|
|
// not present, then validation is performed and we fail during the apply
|
|
func TestSyncOptionsValidateTrue(t *testing.T) {
|
|
// k3s does not validate at all, so this test does not work
|
|
if os.Getenv("ARGOCD_E2E_K3S") == "true" {
|
|
t.SkipNow()
|
|
}
|
|
Given(t).
|
|
Path("sync-options-validate-false").
|
|
When().
|
|
IgnoreErrors().
|
|
CreateApp().
|
|
PatchFile("invalid-cm.yaml", `[{"op": "remove", "path": "/metadata/annotations"}]`).
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationFailed))
|
|
}
|
|
|
|
func TestSyncWithStatusIgnored(t *testing.T) {
|
|
ctx := Given(t)
|
|
ctx.
|
|
Path(guestbookPath).
|
|
When().
|
|
And(func() {
|
|
require.NoError(t, SetResourceOverrides(map[string]ResourceOverride{
|
|
"/": {
|
|
IgnoreDifferences: OverrideIgnoreDiff{JSONPointers: []string{"/status"}},
|
|
},
|
|
}))
|
|
}).
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.SyncPolicy = &SyncPolicy{Automated: &SyncPolicyAutomated{SelfHeal: new(true)}}
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
// app should remain synced if git change detected
|
|
When().
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{ "op": "add", "path": "/status", "value": { "observedGeneration": 1 }}]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
// app should remain synced if k8s change detected
|
|
When().
|
|
And(func() {
|
|
errors.NewHandler(t).FailOnErr(KubeClientset.AppsV1().Deployments(ctx.DeploymentNamespace()).Patch(t.Context(),
|
|
"guestbook-ui", types.JSONPatchType, []byte(`[{ "op": "replace", "path": "/status/observedGeneration", "value": 2 }]`), metav1.PatchOptions{}))
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced))
|
|
}
|
|
|
|
func TestSyncWithApplyOutOfSyncOnly(t *testing.T) {
|
|
var ns string
|
|
Given(t).
|
|
Path(guestbookPath).
|
|
ApplyOutOfSyncOnly().
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
ns = app.Spec.Destination.Namespace
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync)).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
When().
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{ "op": "replace", "path": "/spec/replicas", "value": 1 }]`).
|
|
Sync().
|
|
Then().
|
|
// Only one resource should be in sync result
|
|
Expect(ResourceResultNumbering(1)).
|
|
Expect(ResourceResultIs(ResourceResult{Group: "apps", Version: "v1", Kind: "Deployment", Namespace: ns, Name: "guestbook-ui", Message: "deployment.apps/guestbook-ui configured", SyncPhase: SyncPhaseSync, HookPhase: OperationRunning, Status: ResultCodeSynced, Images: []string{"quay.io/argoprojlabs/argocd-e2e-container:0.2"}}))
|
|
}
|
|
|
|
func TestSyncWithSkipHook(t *testing.T) {
|
|
SkipOnEnv(t, "OPENSHIFT")
|
|
Given(t).
|
|
Path(guestbookPath).
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.SyncPolicy = &SyncPolicy{Automated: &SyncPolicyAutomated{SelfHeal: new(true)}}
|
|
}).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
// app should remain synced when app has skipped annotation even if git change detected
|
|
When().
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{ "op": "add", "path": "/metadata/annotations", "value": { "argocd.argoproj.io/hook": "Skip" }}]`).
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{ "op": "replace", "path": "/spec/replicas", "value": 1 }]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
// app should not remain synced if skipped annotation removed
|
|
When().
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{ "op": "remove", "path": "/metadata/annotations" }]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeOutOfSync))
|
|
}
|
|
|
|
func TestSyncWithForceReplace(t *testing.T) {
|
|
ctx := Given(t)
|
|
t.Cleanup(func() {
|
|
// remove finalizer to ensure easy cleanup
|
|
_, err := Run("", "kubectl", "patch", "deployment", "guestbook-ui", "-n", ctx.DeploymentNamespace(), "-p", `{"metadata":{"finalizers":[]}}`, "--type=merge")
|
|
require.NoError(t, err)
|
|
})
|
|
|
|
ctx.
|
|
Path(guestbookPath).
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
// app having `Replace=true` and `Force=true` annotation should sync succeed if change in immutable field
|
|
// The finalizers allow us to validate that the existing resource (no finalizers) is just deleted once
|
|
// and does not get stuck in terminating state
|
|
When().
|
|
PatchFile("guestbook-ui-deployment.yaml", fmt.Sprintf(`[{ "op": "add", "path": "/metadata/finalizers", "value": [%q]}]`, TestFinalizer)).
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{ "op": "add", "path": "/metadata/annotations", "value": { "argocd.argoproj.io/sync-options": "Force=true,Replace=true" }}]`).
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{ "op": "add", "path": "/spec/selector/matchLabels/env", "value": "e2e" }, { "op": "add", "path": "/spec/template/metadata/labels/env", "value": "e2e" }]`).
|
|
PatchFile("guestbook-ui-deployment.yaml", `[{ "op": "replace", "path": "/spec/replicas", "value": 2 }]`).
|
|
Refresh(RefreshTypeNormal).
|
|
Sync().
|
|
Then().
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(HealthIs(health.HealthStatusHealthy))
|
|
}
|
|
|
|
// Given application is set with --sync-option CreateNamespace=true and --sync-option ServerSideApply=true
|
|
//
|
|
// application --dest-namespace exists
|
|
//
|
|
// Then, --dest-namespace is created with server side apply
|
|
// application is synced and healthy with resource
|
|
// application resources created with server side apply in the newly created namespace.
|
|
func TestNamespaceCreationWithSSA(t *testing.T) {
|
|
SkipOnEnv(t, "OPENSHIFT")
|
|
namespace := getNewNamespace(t)
|
|
defer func() {
|
|
if !t.Skipped() {
|
|
errors.NewHandler(t).FailOnErr(Run("", "kubectl", "delete", "namespace", namespace))
|
|
}
|
|
}()
|
|
|
|
Given(t).
|
|
Path("guestbook").
|
|
When().
|
|
CreateFromFile(func(app *Application) {
|
|
app.Spec.Destination.Namespace = namespace
|
|
app.Spec.SyncPolicy = &SyncPolicy{
|
|
SyncOptions: SyncOptions{"CreateNamespace=true", "ServerSideApply=true"},
|
|
}
|
|
}).
|
|
Then().
|
|
Expect(NoNamespace(namespace)).
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(Success("")).
|
|
Expect(Namespace(namespace, func(_ *Application, ns *corev1.Namespace) {
|
|
assert.NotContains(t, ns.Annotations, "kubectl.kubernetes.io/last-applied-configuration")
|
|
})).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(ResourceHealthWithNamespaceIs("Deployment", "guestbook-ui", namespace, health.HealthStatusHealthy)).
|
|
Expect(ResourceSyncStatusWithNamespaceIs("Deployment", "guestbook-ui", namespace, SyncStatusCodeSynced)).
|
|
Expect(ResourceHealthWithNamespaceIs("Service", "guestbook-ui", namespace, health.HealthStatusHealthy)).
|
|
Expect(ResourceSyncStatusWithNamespaceIs("Service", "guestbook-ui", namespace, SyncStatusCodeSynced))
|
|
}
|