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]>
205 lines
6.2 KiB
Go
205 lines
6.2 KiB
Go
package db
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"hash/fnv"
|
|
"net/netip"
|
|
"net/url"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
corev1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/fields"
|
|
"k8s.io/apimachinery/pkg/labels"
|
|
"k8s.io/apimachinery/pkg/selection"
|
|
informersv1 "k8s.io/client-go/informers/core/v1"
|
|
"k8s.io/client-go/tools/cache"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
"github.com/hanzoai/deploy/util"
|
|
)
|
|
|
|
func (db *db) listSecretsByType(types ...string) ([]*corev1.Secret, error) {
|
|
labelSelector := labels.NewSelector()
|
|
req, err := labels.NewRequirement(common.LabelKeySecretType, selection.Equals, types)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
labelSelector = labelSelector.Add(*req)
|
|
|
|
secretsLister, err := db.settingsMgr.GetSecretsLister()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
secrets, err := secretsLister.Secrets(db.ns).List(labelSelector)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// SecretNamespaceLister lists all Secrets in the indexer for a given namespace.
|
|
// Objects returned by the lister must be treated as read-only.
|
|
// To allow us to modify the secrets, make a copy
|
|
secrets = util.SliceCopy(secrets)
|
|
return secrets, nil
|
|
}
|
|
|
|
func boolOrFalse(secret *corev1.Secret, key string) (bool, error) {
|
|
val, present := secret.Data[key]
|
|
if !present {
|
|
return false, nil
|
|
}
|
|
|
|
return strconv.ParseBool(string(val))
|
|
}
|
|
|
|
func intOrZero(secret *corev1.Secret, key string) (int64, error) {
|
|
val, present := secret.Data[key]
|
|
if !present {
|
|
return 0, nil
|
|
}
|
|
|
|
return strconv.ParseInt(string(val), 10, 64)
|
|
}
|
|
|
|
func updateSecretBool(secret *corev1.Secret, key string, value bool) {
|
|
if _, present := secret.Data[key]; present || value {
|
|
secret.Data[key] = []byte(strconv.FormatBool(value))
|
|
}
|
|
}
|
|
|
|
func updateSecretInt(secret *corev1.Secret, key string, value int64) {
|
|
if _, present := secret.Data[key]; present || value != 0 {
|
|
secret.Data[key] = []byte(strconv.FormatInt(value, 10))
|
|
}
|
|
}
|
|
|
|
func updateSecretString(secret *corev1.Secret, key, value string) {
|
|
if _, present := secret.Data[key]; present || value != "" {
|
|
secret.Data[key] = []byte(value)
|
|
}
|
|
}
|
|
|
|
func (db *db) createSecret(ctx context.Context, secret *corev1.Secret) (*corev1.Secret, error) {
|
|
return db.kubeclientset.CoreV1().Secrets(db.ns).Create(ctx, secret, metav1.CreateOptions{})
|
|
}
|
|
|
|
func addSecretMetadata(secret *corev1.Secret, secretType string) {
|
|
if secret.Annotations == nil {
|
|
secret.Annotations = map[string]string{}
|
|
}
|
|
secret.Annotations[common.AnnotationKeyManagedBy] = common.AnnotationValueManagedByArgoCD
|
|
|
|
if secret.Labels == nil {
|
|
secret.Labels = map[string]string{}
|
|
}
|
|
secret.Labels[common.LabelKeySecretType] = secretType
|
|
}
|
|
|
|
func (db *db) deleteSecret(ctx context.Context, secret *corev1.Secret) error {
|
|
var err error
|
|
|
|
canDelete := secret.Annotations != nil && secret.Annotations[common.AnnotationKeyManagedBy] == common.AnnotationValueManagedByArgoCD
|
|
if canDelete {
|
|
err = db.kubeclientset.CoreV1().Secrets(db.ns).Delete(ctx, secret.Name, metav1.DeleteOptions{})
|
|
} else {
|
|
delete(secret.Labels, common.LabelKeySecretType)
|
|
_, err = db.kubeclientset.CoreV1().Secrets(db.ns).Update(ctx, secret, metav1.UpdateOptions{})
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
// secretEventHandlerFuncs builds the informer event handlers used by watchSecrets,
|
|
// dispatching add/update/delete events for *corev1.Secret objects to the provided
|
|
// callbacks. DeleteFunc unwraps cache.DeletedFinalStateUnknown tombstones before the
|
|
// type assertion, and events whose object is not a *corev1.Secret (including
|
|
// tombstones wrapping a nil or unexpected object) are ignored.
|
|
func secretEventHandlerFuncs(
|
|
handleAddEvent func(secret *corev1.Secret),
|
|
handleModEvent func(oldSecret *corev1.Secret, newSecret *corev1.Secret),
|
|
handleDeleteEvent func(secret *corev1.Secret),
|
|
) cache.ResourceEventHandlerFuncs {
|
|
return cache.ResourceEventHandlerFuncs{
|
|
AddFunc: func(obj any) {
|
|
if secretObj, ok := obj.(*corev1.Secret); ok {
|
|
handleAddEvent(secretObj)
|
|
}
|
|
},
|
|
DeleteFunc: func(obj any) {
|
|
// Unwrap DeletedFinalStateUnknown tombstones
|
|
if tombstone, ok := obj.(cache.DeletedFinalStateUnknown); ok {
|
|
obj = tombstone.Obj
|
|
}
|
|
if secretObj, ok := obj.(*corev1.Secret); ok {
|
|
handleDeleteEvent(secretObj)
|
|
}
|
|
},
|
|
UpdateFunc: func(oldObj, newObj any) {
|
|
if oldSecretObj, ok := oldObj.(*corev1.Secret); ok {
|
|
if newSecretObj, ok := newObj.(*corev1.Secret); ok {
|
|
handleModEvent(oldSecretObj, newSecretObj)
|
|
}
|
|
}
|
|
},
|
|
}
|
|
}
|
|
|
|
func (db *db) watchSecrets(ctx context.Context,
|
|
secretType string,
|
|
handleAddEvent func(secret *corev1.Secret),
|
|
handleModEvent func(oldSecret *corev1.Secret, newSecret *corev1.Secret),
|
|
handleDeleteEvent func(secret *corev1.Secret),
|
|
) {
|
|
secretListOptions := func(options *metav1.ListOptions) {
|
|
labelSelector := fields.ParseSelectorOrDie(common.LabelKeySecretType + "=" + secretType)
|
|
options.LabelSelector = labelSelector.String()
|
|
}
|
|
secretEventHandler := secretEventHandlerFuncs(handleAddEvent, handleModEvent, handleDeleteEvent)
|
|
|
|
indexers := cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}
|
|
clusterSecretInformer := informersv1.NewFilteredSecretInformer(db.kubeclientset, db.ns, 3*time.Minute, indexers, secretListOptions)
|
|
_, err := clusterSecretInformer.AddEventHandler(secretEventHandler)
|
|
if err != nil {
|
|
log.Error(err)
|
|
}
|
|
|
|
log.Info("Starting secretInformer for", secretType)
|
|
go func() {
|
|
clusterSecretInformer.Run(ctx.Done())
|
|
log.Info("secretInformer for", secretType, "cancelled")
|
|
}()
|
|
<-ctx.Done()
|
|
}
|
|
|
|
// URIToSecretName hashes an uri address to the secret name using a formula.
|
|
// Part of the uri address is incorporated for debugging purposes
|
|
func URIToSecretName(uriType, uri string) (string, error) {
|
|
parsedURI, err := url.ParseRequestURI(uri)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
host := parsedURI.Host
|
|
if strings.HasPrefix(host, "[") {
|
|
last := strings.Index(host, "]")
|
|
if last >= 0 {
|
|
addr, err := netip.ParseAddr(host[1:last])
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
host = strings.ReplaceAll(addr.String(), ":", "-")
|
|
}
|
|
} else {
|
|
last := strings.Index(host, ":")
|
|
if last >= 0 {
|
|
host = host[0:last]
|
|
}
|
|
}
|
|
h := fnv.New32a()
|
|
_, _ = h.Write([]byte(uri))
|
|
host = strings.ToLower(host)
|
|
return fmt.Sprintf("%s-%s-%v", uriType, host, h.Sum32()), nil
|
|
}
|