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]>
490 lines
11 KiB
Go
490 lines
11 KiB
Go
package admin
|
|
|
|
import (
|
|
"bytes"
|
|
"testing"
|
|
|
|
"github.com/hanzoai/deploy/pkg/apis/application/v1alpha1"
|
|
"github.com/hanzoai/deploy/util/security"
|
|
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/utils/kube"
|
|
"github.com/stretchr/testify/assert"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
)
|
|
|
|
func newBackupObject(trackingValue string, trackingLabel bool, trackingAnnotation bool) *unstructured.Unstructured {
|
|
cm := corev1.ConfigMap{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "my-configmap",
|
|
Namespace: "namespace",
|
|
},
|
|
Data: map[string]string{
|
|
"foo": "bar",
|
|
},
|
|
}
|
|
if trackingLabel {
|
|
cm.SetLabels(map[string]string{
|
|
common.LabelKeyAppInstance: trackingValue,
|
|
})
|
|
}
|
|
if trackingAnnotation {
|
|
cm.SetAnnotations(map[string]string{
|
|
common.AnnotationKeyAppInstance: trackingValue,
|
|
})
|
|
}
|
|
return kube.MustToUnstructured(&cm)
|
|
}
|
|
|
|
func newConfigmapObject() *unstructured.Unstructured {
|
|
cm := corev1.ConfigMap{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: common.ArgoCDConfigMapName,
|
|
Namespace: "argocd",
|
|
Labels: map[string]string{
|
|
"app.kubernetes.io/part-of": "argocd",
|
|
},
|
|
},
|
|
}
|
|
|
|
return kube.MustToUnstructured(&cm)
|
|
}
|
|
|
|
func newSecretsObject() *unstructured.Unstructured {
|
|
secret := corev1.Secret{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: common.ArgoCDSecretName,
|
|
Namespace: "default",
|
|
Labels: map[string]string{
|
|
"app.kubernetes.io/part-of": "argocd",
|
|
},
|
|
},
|
|
Data: map[string][]byte{
|
|
"admin.password": nil,
|
|
"server.secretkey": nil,
|
|
},
|
|
}
|
|
|
|
return kube.MustToUnstructured(&secret)
|
|
}
|
|
|
|
func newAppProject() *unstructured.Unstructured {
|
|
appProject := v1alpha1.AppProject{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "default",
|
|
Namespace: "argocd",
|
|
},
|
|
Spec: v1alpha1.AppProjectSpec{
|
|
Destinations: []v1alpha1.ApplicationDestination{
|
|
{
|
|
Namespace: "*",
|
|
Server: "*",
|
|
},
|
|
},
|
|
ClusterResourceWhitelist: []v1alpha1.ClusterResourceRestrictionItem{
|
|
{
|
|
Group: "*",
|
|
Kind: "*",
|
|
},
|
|
},
|
|
SourceRepos: []string{"*"},
|
|
},
|
|
}
|
|
|
|
return kube.MustToUnstructured(&appProject)
|
|
}
|
|
|
|
func newApplication(namespace string) *unstructured.Unstructured {
|
|
app := v1alpha1.Application{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "Application",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "test",
|
|
Namespace: namespace,
|
|
},
|
|
Spec: v1alpha1.ApplicationSpec{
|
|
Source: &v1alpha1.ApplicationSource{},
|
|
Project: "default",
|
|
Destination: v1alpha1.ApplicationDestination{
|
|
Server: v1alpha1.KubernetesInternalAPIServerAddr,
|
|
Namespace: "default",
|
|
},
|
|
},
|
|
}
|
|
|
|
return kube.MustToUnstructured(&app)
|
|
}
|
|
|
|
func newApplicationSet(namespace string) *unstructured.Unstructured {
|
|
appSet := v1alpha1.ApplicationSet{
|
|
TypeMeta: metav1.TypeMeta{
|
|
Kind: "ApplicationSet",
|
|
},
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "test-appset",
|
|
Namespace: namespace,
|
|
},
|
|
Spec: v1alpha1.ApplicationSetSpec{
|
|
Generators: []v1alpha1.ApplicationSetGenerator{
|
|
{
|
|
Git: &v1alpha1.GitGenerator{
|
|
RepoURL: "https://github.com/org/repo",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
return kube.MustToUnstructured(&appSet)
|
|
}
|
|
|
|
// Test_exportResources tests for the resources exported when using the `argocd admin export` command
|
|
func Test_exportResources(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
object *unstructured.Unstructured
|
|
namespace string
|
|
enabledNamespaces []string
|
|
expectedFileContent string
|
|
expectExport bool
|
|
}{
|
|
{
|
|
name: "ConfigMap should be in the exported manifest",
|
|
object: newConfigmapObject(),
|
|
expectExport: true,
|
|
expectedFileContent: `apiVersion: ""
|
|
kind: ""
|
|
metadata:
|
|
labels:
|
|
app.kubernetes.io/part-of: argocd
|
|
name: argocd-cm
|
|
---
|
|
`,
|
|
},
|
|
{
|
|
name: "Secret should be in the exported manifest",
|
|
object: newSecretsObject(),
|
|
expectExport: true,
|
|
expectedFileContent: `apiVersion: ""
|
|
data:
|
|
admin.password: null
|
|
server.secretkey: null
|
|
kind: ""
|
|
metadata:
|
|
labels:
|
|
app.kubernetes.io/part-of: argocd
|
|
name: argocd-secret
|
|
namespace: default
|
|
---
|
|
`,
|
|
},
|
|
{
|
|
name: "App Project should be in the exported manifest",
|
|
object: newAppProject(),
|
|
expectExport: true,
|
|
expectedFileContent: `apiVersion: ""
|
|
kind: ""
|
|
metadata:
|
|
name: default
|
|
spec:
|
|
clusterResourceWhitelist:
|
|
- group: '*'
|
|
kind: '*'
|
|
destinations:
|
|
- namespace: '*'
|
|
server: '*'
|
|
sourceRepos:
|
|
- '*'
|
|
status: {}
|
|
---
|
|
`,
|
|
},
|
|
{
|
|
name: "Application should be in the exported manifest when created in the default 'argocd' namespace",
|
|
object: newApplication("argocd"),
|
|
namespace: "argocd",
|
|
expectExport: true,
|
|
expectedFileContent: `apiVersion: ""
|
|
kind: Application
|
|
metadata:
|
|
name: test
|
|
spec:
|
|
destination:
|
|
namespace: default
|
|
server: https://kubernetes.default.svc
|
|
project: default
|
|
source:
|
|
repoURL: ""
|
|
status:
|
|
health: {}
|
|
sourceHydrator: {}
|
|
summary: {}
|
|
sync:
|
|
comparedTo:
|
|
destination: {}
|
|
source:
|
|
repoURL: ""
|
|
status: ""
|
|
---
|
|
`,
|
|
},
|
|
{
|
|
name: "Application should be in the exported manifest when created in the enabled namespaces",
|
|
object: newApplication("dev"),
|
|
namespace: "dev",
|
|
enabledNamespaces: []string{"dev", "prod"},
|
|
expectExport: true,
|
|
expectedFileContent: `apiVersion: ""
|
|
kind: Application
|
|
metadata:
|
|
name: test
|
|
namespace: dev
|
|
spec:
|
|
destination:
|
|
namespace: default
|
|
server: https://kubernetes.default.svc
|
|
project: default
|
|
source:
|
|
repoURL: ""
|
|
status:
|
|
health: {}
|
|
sourceHydrator: {}
|
|
summary: {}
|
|
sync:
|
|
comparedTo:
|
|
destination: {}
|
|
source:
|
|
repoURL: ""
|
|
status: ""
|
|
---
|
|
`,
|
|
},
|
|
{
|
|
name: "Application should not be in the exported manifest when it's neither created in the default argod namespace nor in enabled namespace",
|
|
object: newApplication("staging"),
|
|
namespace: "staging",
|
|
enabledNamespaces: []string{"dev", "prod"},
|
|
expectExport: false,
|
|
expectedFileContent: ``,
|
|
},
|
|
{
|
|
name: "ApplicationSet should be in the exported manifest when created in the default 'argocd' namespace",
|
|
object: newApplicationSet("argocd"),
|
|
namespace: "argocd",
|
|
expectExport: true,
|
|
expectedFileContent: `apiVersion: ""
|
|
kind: ApplicationSet
|
|
metadata:
|
|
name: test-appset
|
|
spec:
|
|
generators:
|
|
- git:
|
|
repoURL: https://github.com/org/repo
|
|
revision: ""
|
|
template:
|
|
metadata: {}
|
|
spec:
|
|
destination: {}
|
|
project: ""
|
|
template:
|
|
metadata: {}
|
|
spec:
|
|
destination: {}
|
|
project: ""
|
|
status:
|
|
health: {}
|
|
---
|
|
`,
|
|
},
|
|
{
|
|
name: "ApplicationSet should be in the exported manifest when created in the enabled namespaces",
|
|
object: newApplicationSet("dev"),
|
|
namespace: "dev",
|
|
enabledNamespaces: []string{"dev", "prod"},
|
|
expectExport: true,
|
|
expectedFileContent: `apiVersion: ""
|
|
kind: ApplicationSet
|
|
metadata:
|
|
name: test-appset
|
|
namespace: dev
|
|
spec:
|
|
generators:
|
|
- git:
|
|
repoURL: https://github.com/org/repo
|
|
revision: ""
|
|
template:
|
|
metadata: {}
|
|
spec:
|
|
destination: {}
|
|
project: ""
|
|
template:
|
|
metadata: {}
|
|
spec:
|
|
destination: {}
|
|
project: ""
|
|
status:
|
|
health: {}
|
|
---
|
|
`,
|
|
},
|
|
{
|
|
name: "ApplicationSet should not be in the exported manifest when neither created in the default 'argocd' namespace nor in enabled namespaces",
|
|
object: newApplicationSet("staging"),
|
|
namespace: "staging",
|
|
enabledNamespaces: []string{"dev", "prod"},
|
|
expectExport: false,
|
|
expectedFileContent: ``,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
var buf bytes.Buffer
|
|
|
|
kind := tt.object.GetKind()
|
|
if kind == "Application" || kind == "ApplicationSet" {
|
|
if security.IsNamespaceEnabled(tt.namespace, "argocd", tt.enabledNamespaces) {
|
|
export(&buf, *tt.object, ArgoCDNamespace)
|
|
}
|
|
} else {
|
|
export(&buf, *tt.object, ArgoCDNamespace)
|
|
}
|
|
|
|
content := buf.String()
|
|
if tt.expectExport {
|
|
assert.Equal(t, tt.expectedFileContent, content)
|
|
} else {
|
|
assert.Empty(t, content)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func Test_updateTracking(t *testing.T) {
|
|
type args struct {
|
|
bak *unstructured.Unstructured
|
|
live *unstructured.Unstructured
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
expected *unstructured.Unstructured
|
|
}{
|
|
{
|
|
name: "update annotation when present in live",
|
|
args: args{
|
|
bak: newBackupObject("bak", false, true),
|
|
live: newBackupObject("live", false, true),
|
|
},
|
|
expected: newBackupObject("live", false, true),
|
|
},
|
|
{
|
|
name: "update default label when present in live",
|
|
args: args{
|
|
bak: newBackupObject("bak", true, true),
|
|
live: newBackupObject("live", true, true),
|
|
},
|
|
expected: newBackupObject("live", true, true),
|
|
},
|
|
{
|
|
name: "do not update if live object does not have tracking",
|
|
args: args{
|
|
bak: newBackupObject("bak", true, true),
|
|
live: newBackupObject("live", false, false),
|
|
},
|
|
expected: newBackupObject("bak", true, true),
|
|
},
|
|
{
|
|
name: "do not update if bak object does not have tracking",
|
|
args: args{
|
|
bak: newBackupObject("bak", false, false),
|
|
live: newBackupObject("live", true, true),
|
|
},
|
|
expected: newBackupObject("bak", false, false),
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
updateTracking(tt.args.bak, tt.args.live)
|
|
assert.Equal(t, tt.expected, tt.args.bak)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIsSkipLabelMatches(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
obj *unstructured.Unstructured
|
|
skipLabels string
|
|
expected bool
|
|
}{
|
|
{
|
|
name: "Label matches",
|
|
obj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"labels": map[string]any{
|
|
"test-label": "value",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
skipLabels: "test-label=value",
|
|
expected: true,
|
|
},
|
|
{
|
|
name: "Label does not match",
|
|
obj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"labels": map[string]any{
|
|
"different-label": "value",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
skipLabels: "test-label=value",
|
|
expected: false,
|
|
},
|
|
{
|
|
name: "Empty skip labels",
|
|
obj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"labels": map[string]any{
|
|
"test-label": "value",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
skipLabels: "",
|
|
expected: false,
|
|
},
|
|
{
|
|
name: "No labels value",
|
|
obj: &unstructured.Unstructured{
|
|
Object: map[string]any{
|
|
"metadata": map[string]any{
|
|
"labels": map[string]any{
|
|
"test-label": "value",
|
|
"another-label": "value2",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
skipLabels: "test-label",
|
|
expected: false,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
result := isSkipLabelMatches(tt.obj, tt.skipLabels)
|
|
assert.Equal(t, tt.expected, result)
|
|
})
|
|
}
|
|
}
|