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]>
165 lines
5.3 KiB
Go
165 lines
5.3 KiB
Go
package e2e
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"strconv"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
rbacv1 "k8s.io/api/rbac/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/util/wait"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/health"
|
|
. "github.com/hanzoai/deploy/gitops-engine/pkg/sync/common"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
. "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/clusterauth"
|
|
)
|
|
|
|
// TestShardReconcilesAssignedApps tests to see if a shard only reconciles apps deploying to the clusters
|
|
// it is managing
|
|
func TestShardsReconcileAssignedApps(t *testing.T) {
|
|
// Skip if running in a remote cluster due to not supporting infrastructure at the moment
|
|
if remote := IsRemote(); remote {
|
|
t.Skip("At the moment this test only works when not in cluster")
|
|
}
|
|
|
|
ctx := Given(t)
|
|
|
|
shard0ClusterName := createClusterSecretWithShard(ctx, 0, ctx.DeploymentNamespace())
|
|
shard1ClusterName := createClusterSecretWithShard(ctx, 1, ctx.DeploymentNamespace())
|
|
|
|
env := map[string]string{
|
|
common.EnvControllerShard: "0",
|
|
common.EnvControllerReplicas: "2",
|
|
}
|
|
err := RestartProcess(ApplicationControllerProcName, env)
|
|
require.NoError(t, err)
|
|
|
|
ctx.
|
|
Path("shards-sync-assigned-apps/app-1").
|
|
Name("shard-test-app-shard-1").
|
|
DestName(shard0ClusterName).
|
|
When().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
Expect(ResourceHealthIs("ConfigMap", "app-1-cm", health.HealthStatusHealthy))
|
|
|
|
ctx2 := GivenWithSameState(ctx).
|
|
Path("shards-sync-assigned-apps/app-2").
|
|
Timeout(5).
|
|
Name("shard-test-app-shard-2").
|
|
DestName(shard1ClusterName).
|
|
When().
|
|
IgnoreErrors().
|
|
CreateApp().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationRunning)).
|
|
Expect(ResourceHealthIs("ConfigMap", "app-2-cm", health.HealthStatusMissing))
|
|
|
|
env[common.EnvControllerShard] = "1"
|
|
err = RestartProcess(ApplicationControllerProcName, env)
|
|
require.NoError(t, err)
|
|
|
|
ctx2.
|
|
When().
|
|
Sync().
|
|
Then().
|
|
Expect(OperationPhaseIs(OperationSucceeded)).
|
|
Expect(SyncStatusIs(SyncStatusCodeSynced)).
|
|
Expect(HealthIs(health.HealthStatusHealthy)).
|
|
Expect(ResourceHealthIs("ConfigMap", "app-2-cm", health.HealthStatusHealthy))
|
|
}
|
|
|
|
// createClusterSecretWithShard creates a cluster secret and assigns it to a shard
|
|
func createClusterSecretWithShard(ctx *Context, shard int, ns string) string {
|
|
// Create a ServiceAccount, role, and role binding to be used for a bearer token
|
|
serviceAccountName := DnsFriendly("argocd-e2e", "-shard-"+strconv.Itoa(shard)+"-sa-"+ctx.ShortID())
|
|
err := clusterauth.CreateServiceAccount(KubeClientset, serviceAccountName, ns)
|
|
require.NoError(ctx.T(), err)
|
|
|
|
clusterRole := rbacv1.ClusterRole{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: DnsFriendly("allow-all-shard"+strconv.Itoa(shard), "-"+ctx.ShortID()),
|
|
Labels: map[string]string{
|
|
TestingLabel: "true",
|
|
},
|
|
},
|
|
Rules: []rbacv1.PolicyRule{{
|
|
Verbs: []string{"*"},
|
|
Resources: []string{"*"},
|
|
APIGroups: []string{"*"},
|
|
}},
|
|
}
|
|
_, err = KubeClientset.RbacV1().ClusterRoles().Create(ctx.T().Context(), &clusterRole, metav1.CreateOptions{})
|
|
require.NoError(ctx.T(), err)
|
|
|
|
clusterRoleBinding := rbacv1.ClusterRoleBinding{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: DnsFriendly("allow-all-binding-shard"+strconv.Itoa(shard), "-"+ctx.ShortID()),
|
|
Labels: map[string]string{
|
|
TestingLabel: "true",
|
|
},
|
|
},
|
|
Subjects: []rbacv1.Subject{{
|
|
Kind: rbacv1.ServiceAccountKind,
|
|
Name: serviceAccountName,
|
|
Namespace: ns,
|
|
}},
|
|
RoleRef: rbacv1.RoleRef{
|
|
APIGroup: "rbac.authorization.k8s.io",
|
|
Kind: "ClusterRole",
|
|
Name: clusterRole.Name,
|
|
},
|
|
}
|
|
_, err = KubeClientset.RbacV1().ClusterRoleBindings().Create(ctx.T().Context(), &clusterRoleBinding, metav1.CreateOptions{})
|
|
require.NoError(ctx.T(), err)
|
|
|
|
var token string
|
|
// Trying to patch a ServiceAccount could fail so try again up to 20 seconds
|
|
// See ./test/e2e/deployment_test.go:334 for exact error
|
|
waitErr := wait.PollUntilContextTimeout(ctx.T().Context(), 1*time.Second, 20*time.Second, true, func(context.Context) (done bool, err error) {
|
|
token, err = clusterauth.GetServiceAccountBearerToken(KubeClientset, ns, serviceAccountName, time.Second*60)
|
|
return (err == nil && token != ""), nil
|
|
})
|
|
require.NoError(ctx.T(), waitErr)
|
|
require.NotEmpty(ctx.T(), token)
|
|
|
|
_, apiURL, err := extractKubeConfigValues()
|
|
require.NoError(ctx.T(), err)
|
|
|
|
clusterName := "test-sharding-shard" + strconv.Itoa(shard) + "-" + ctx.ShortID()
|
|
// Query paramater for the server URL to be unique, this will be ignored by the Kubernetes API
|
|
queryParam := "?shard=" + strconv.Itoa(shard)
|
|
|
|
clusterSecretConfigJSON := ClusterConfig{
|
|
BearerToken: token,
|
|
TLSClientConfig: TLSClientConfig{
|
|
Insecure: true,
|
|
},
|
|
}
|
|
|
|
jsonStringBytes, err := json.Marshal(clusterSecretConfigJSON)
|
|
require.NoError(ctx.T(), err)
|
|
|
|
secret := buildArgoCDClusterSecret(clusterName, ArgoCDNamespace, clusterName, apiURL+queryParam,
|
|
string(jsonStringBytes), "", "")
|
|
secret.Data["shard"] = []byte(strconv.Itoa(shard))
|
|
|
|
_, err = KubeClientset.CoreV1().Secrets(secret.Namespace).Create(ctx.T().Context(), &secret, metav1.CreateOptions{})
|
|
require.NoError(ctx.T(), err)
|
|
|
|
return clusterName
|
|
}
|