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]>
217 lines
7.2 KiB
Go
217 lines
7.2 KiB
Go
package kube
|
|
|
|
import (
|
|
_ "embed"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
openapi_v2 "github.com/google/gnostic-models/openapiv2"
|
|
"github.com/stretchr/testify/require"
|
|
"k8s.io/apimachinery/pkg/version"
|
|
"k8s.io/client-go/rest"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"k8s.io/klog/v2/textlogger"
|
|
|
|
testingutils "github.com/hanzoai/deploy/gitops-engine/pkg/utils/testing"
|
|
"github.com/hanzoai/deploy/gitops-engine/pkg/utils/tracing"
|
|
)
|
|
|
|
var _ Kubectl = &KubectlCmd{}
|
|
|
|
func TestConvertToVersion(t *testing.T) {
|
|
t.Parallel()
|
|
kubectl := KubectlCmd{
|
|
Log: textlogger.NewLogger(textlogger.NewConfig()),
|
|
Tracer: tracing.NopTracer{},
|
|
}
|
|
t.Run("AppsDeployment", func(t *testing.T) {
|
|
t.Parallel()
|
|
newObj, err := kubectl.ConvertToVersion(testingutils.UnstructuredFromFile("testdata/appsdeployment.yaml"), "apps", "v1")
|
|
if assert.NoError(t, err) {
|
|
gvk := newObj.GroupVersionKind()
|
|
assert.Equal(t, "apps", gvk.Group)
|
|
assert.Equal(t, "v1", gvk.Version)
|
|
}
|
|
})
|
|
t.Run("CustomResource", func(t *testing.T) {
|
|
t.Parallel()
|
|
_, err := kubectl.ConvertToVersion(testingutils.UnstructuredFromFile("testdata/cr.yaml"), "argoproj.io", "v1")
|
|
assert.Error(t, err)
|
|
})
|
|
t.Run("ExtensionsDeployment", func(t *testing.T) {
|
|
t.Parallel()
|
|
obj := testingutils.UnstructuredFromFile("testdata/nginx.yaml")
|
|
|
|
// convert an extensions/v1beta1 object into itself
|
|
newObj, err := kubectl.ConvertToVersion(obj, "extensions", "v1beta1")
|
|
if assert.NoError(t, err) {
|
|
gvk := newObj.GroupVersionKind()
|
|
assert.Equal(t, "extensions", gvk.Group)
|
|
assert.Equal(t, "v1beta1", gvk.Version)
|
|
}
|
|
|
|
// convert an extensions/v1beta1 object into an apps/v1
|
|
newObj, err = kubectl.ConvertToVersion(obj, "apps", "v1")
|
|
if assert.NoError(t, err) {
|
|
gvk := newObj.GroupVersionKind()
|
|
assert.Equal(t, "apps", gvk.Group)
|
|
assert.Equal(t, "v1", gvk.Version)
|
|
}
|
|
|
|
// converting it again should not have any affect
|
|
newObj, err = kubectl.ConvertToVersion(obj, "apps", "v1")
|
|
if assert.NoError(t, err) {
|
|
gvk := newObj.GroupVersionKind()
|
|
assert.Equal(t, "apps", gvk.Group)
|
|
assert.Equal(t, "v1", gvk.Version)
|
|
}
|
|
})
|
|
t.Run("newGVKParser gracefully handles duplicate GVKs", func(t *testing.T) {
|
|
t.Parallel()
|
|
client := &fakeOpenAPIClient{}
|
|
_, err := kubectl.newGVKParser(client)
|
|
require.NoError(t, err)
|
|
})
|
|
}
|
|
|
|
func TestGetServerVersion(t *testing.T) {
|
|
t.Parallel()
|
|
t.Run("returns full semantic version with patch", func(t *testing.T) {
|
|
t.Parallel()
|
|
fakeServer := fakeHTTPServer(version.Info{
|
|
Major: "1",
|
|
Minor: "34",
|
|
GitVersion: "v1.34.0",
|
|
GitCommit: "abc123def456",
|
|
Platform: "linux/amd64",
|
|
}, nil)
|
|
defer fakeServer.Close()
|
|
config := mockConfig(fakeServer.URL)
|
|
|
|
serverVersion, err := kubectlCmd().GetServerVersion(config)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "v1.34.0", serverVersion, "Should return full semantic serverVersion")
|
|
assert.Regexp(t, `^v\d+\.\d+\.\d+`, serverVersion, "Should match semver pattern with 'v' prefix")
|
|
assert.NotEqual(t, "1.34", serverVersion, "Should not be old Major.Minor format")
|
|
})
|
|
|
|
t.Run("do not preserver build metadata", func(t *testing.T) {
|
|
t.Parallel()
|
|
fakeServer := fakeHTTPServer(version.Info{
|
|
Major: "1",
|
|
Minor: "30",
|
|
GitVersion: "v1.30.11+IKS",
|
|
GitCommit: "xyz789",
|
|
Platform: "linux/amd64",
|
|
}, nil)
|
|
defer fakeServer.Close()
|
|
config := mockConfig(fakeServer.URL)
|
|
|
|
serverVersion, err := kubectlCmd().GetServerVersion(config)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, "v1.30.11", serverVersion, "Should not preserve build metadata")
|
|
assert.NotContains(t, serverVersion, "+IKS", "Should not contain provider-specific metadata")
|
|
assert.NotEqual(t, "1.30", serverVersion, "Should not strip to Major.Minor")
|
|
})
|
|
|
|
t.Run("handles error from discovery client", func(t *testing.T) {
|
|
t.Parallel()
|
|
fakeServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
}))
|
|
defer fakeServer.Close()
|
|
config := mockConfig(fakeServer.URL)
|
|
|
|
_, err := kubectlCmd().GetServerVersion(config)
|
|
assert.Error(t, err, "Should return error when server fails")
|
|
assert.Contains(t, err.Error(), "failed to get server version",
|
|
"Error should indicate version retrieval failure")
|
|
})
|
|
|
|
t.Run("handles minor version with plus suffix", func(t *testing.T) {
|
|
t.Parallel()
|
|
fakeServer := fakeHTTPServer(version.Info{
|
|
Major: "1",
|
|
Minor: "30+",
|
|
GitVersion: "v1.30.0",
|
|
}, nil)
|
|
defer fakeServer.Close()
|
|
config := mockConfig(fakeServer.URL)
|
|
serverVersion, err := kubectlCmd().GetServerVersion(config)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, "v1.30.0", serverVersion)
|
|
assert.NotContains(t, serverVersion, "+", "Should not contain the '+' from Minor field")
|
|
})
|
|
}
|
|
|
|
func kubectlCmd() *KubectlCmd {
|
|
kubectl := &KubectlCmd{
|
|
Log: textlogger.NewLogger(textlogger.NewConfig()),
|
|
Tracer: tracing.NopTracer{},
|
|
}
|
|
return kubectl
|
|
}
|
|
|
|
/**
|
|
Getting the test data here was challenging.
|
|
|
|
First I needed a Kubernetes cluster with an aggregated API installed which had disagreeing versions of the same
|
|
resource. In this case, I used Kubernetes 1.30.1 and metrics-server 0.7.1. They have different versions of
|
|
APIResourceList.
|
|
|
|
So then I got the protobuf representation of the aggregated OpenAPI doc. I used the following command to get it:
|
|
curl -k https://localhost:6443/openapi/v2 -H "Authorization: Bearer $token" -H "Accept: application/[email protected]+protobuf" > pkg/utils/kube/testdata/openapi_v2.proto
|
|
|
|
Then I unmarshaled the protobuf representation into JSON using the following code:
|
|
|
|
json.Unmarshal(openAPIDoc, document)
|
|
jsondata, _ := json.Marshal(document)
|
|
ioutil.WriteFile("pkg/utils/kube/testdata/openapi_v2.json", jsondata, 0644)
|
|
|
|
This step was necessary because it's not possible to unmarshal the json representation of the OpenAPI doc into the
|
|
openapi_v2.Document struct. I don't know why they're different.
|
|
|
|
Then I used this code to post-process the JSON representation of the OpenAPI doc and remove unnecessary information:
|
|
jq '.definitions.additional_properties |= map(select(.name | test(".*APIResource.*"))) | {definitions: {additional_properties: .definitions.additional_properties}}' pkg/utils/kube/testdata/openapi_v2.json > pkg/utils/kube/testdata/openapi_v2.json.better
|
|
mv pkg/utils/kube/testdata/openapi_v2.json.better pkg/utils/kube/testdata/openapi_v2.json
|
|
|
|
Hopefully we'll never need to reload the test data, because it was to demonstrate a very specific bug.
|
|
*/
|
|
|
|
//go:embed testdata/openapi_v2.json
|
|
var openAPIDoc []byte
|
|
|
|
type fakeOpenAPIClient struct{}
|
|
|
|
func (f *fakeOpenAPIClient) OpenAPISchema() (*openapi_v2.Document, error) {
|
|
document := &openapi_v2.Document{}
|
|
err := json.Unmarshal(openAPIDoc, document)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("failed to unmarshal OpenAPI document: %w", err)
|
|
}
|
|
return document, nil
|
|
}
|
|
|
|
func mockConfig(host string) *rest.Config {
|
|
return &rest.Config{
|
|
Host: host,
|
|
}
|
|
}
|
|
|
|
func fakeHTTPServer(info version.Info, err error) *httptest.Server {
|
|
return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
if r.URL.Path == "/version" {
|
|
versionInfo := info
|
|
w.Header().Set("Content-Type", "application/json")
|
|
_ = json.NewEncoder(w).Encode(versionInfo)
|
|
return
|
|
}
|
|
http.NotFound(w, r)
|
|
}))
|
|
}
|