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]>
134 lines
3.7 KiB
Go
134 lines
3.7 KiB
Go
package dex
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/tls"
|
|
"crypto/x509"
|
|
stderrors "errors"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httputil"
|
|
"net/url"
|
|
"path"
|
|
"strconv"
|
|
"strings"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
|
|
"github.com/hanzoai/deploy/common"
|
|
"github.com/hanzoai/deploy/util/errors"
|
|
)
|
|
|
|
type DexTLSConfig struct {
|
|
DisableTLS bool
|
|
StrictValidation bool
|
|
RootCAs *x509.CertPool
|
|
Certificate []byte
|
|
}
|
|
|
|
func TLSConfig(tlsConfig *DexTLSConfig) *tls.Config {
|
|
if tlsConfig == nil || tlsConfig.DisableTLS {
|
|
return nil
|
|
}
|
|
if !tlsConfig.StrictValidation {
|
|
return &tls.Config{
|
|
InsecureSkipVerify: true,
|
|
}
|
|
}
|
|
return &tls.Config{
|
|
InsecureSkipVerify: false,
|
|
RootCAs: tlsConfig.RootCAs,
|
|
VerifyPeerCertificate: func(rawCerts [][]byte, _ [][]*x509.Certificate) error {
|
|
if !bytes.Equal(rawCerts[0], tlsConfig.Certificate) {
|
|
return stderrors.New("dex server certificate does not match")
|
|
}
|
|
return nil
|
|
},
|
|
}
|
|
}
|
|
|
|
// NewDexHTTPReverseProxy returns a reverse proxy to the Dex server. Dex is assumed to be configured
|
|
// with the external issuer URL muxed to the same path configured in server.go. In other words, if
|
|
// Argo CD API server wants to proxy requests at /api/dex, then the dex config yaml issuer URL should
|
|
// also be /api/dex (e.g. issuer: https://argocd.example.com/api/dex)
|
|
func NewDexHTTPReverseProxy(serverAddr string, baseHRef string, tlsConfig *DexTLSConfig) func(writer http.ResponseWriter, request *http.Request) {
|
|
fullAddr := DexServerAddressWithProtocol(serverAddr, tlsConfig)
|
|
|
|
target, err := url.Parse(fullAddr)
|
|
errors.CheckError(err)
|
|
target.Path = baseHRef
|
|
|
|
proxy := &httputil.ReverseProxy{
|
|
Rewrite: func(r *httputil.ProxyRequest) {
|
|
r.SetURL(target)
|
|
r.Out.Host = target.Host
|
|
},
|
|
ModifyResponse: func(resp *http.Response) error {
|
|
if resp.StatusCode == http.StatusInternalServerError {
|
|
b, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = resp.Body.Close()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
log.WithFields(log.Fields{
|
|
common.SecurityField: common.SecurityMedium,
|
|
}).Errorf("received error from dex: %s", string(b))
|
|
resp.ContentLength = 0
|
|
resp.Header.Set("Content-Length", strconv.Itoa(0))
|
|
resp.Header.Set("Location", path.Join(baseHRef, "login")+"?has_sso_error=true")
|
|
resp.StatusCode = http.StatusSeeOther
|
|
resp.Body = io.NopCloser(bytes.NewReader(make([]byte, 0)))
|
|
return nil
|
|
}
|
|
return nil
|
|
},
|
|
}
|
|
|
|
if tlsConfig != nil && !tlsConfig.DisableTLS {
|
|
proxy.Transport = &http.Transport{
|
|
TLSClientConfig: TLSConfig(tlsConfig),
|
|
}
|
|
}
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
proxy.ServeHTTP(w, r)
|
|
}
|
|
}
|
|
|
|
// NewDexRewriteURLRoundTripper creates a new DexRewriteURLRoundTripper
|
|
func NewDexRewriteURLRoundTripper(dexServerAddr string, t http.RoundTripper) DexRewriteURLRoundTripper {
|
|
dexURL, _ := url.Parse(dexServerAddr)
|
|
return DexRewriteURLRoundTripper{
|
|
DexURL: dexURL,
|
|
T: t,
|
|
}
|
|
}
|
|
|
|
// DexRewriteURLRoundTripper is an HTTP RoundTripper to rewrite HTTP requests to the specified
|
|
// dex server address. This is used when reverse proxying Dex to avoid the API server from
|
|
// unnecessarily communicating to Argo CD through its externally facing load balancer, which is not
|
|
// always permitted in firewalled/air-gapped networks.
|
|
type DexRewriteURLRoundTripper struct {
|
|
DexURL *url.URL
|
|
T http.RoundTripper
|
|
}
|
|
|
|
func (s DexRewriteURLRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
|
|
r.URL.Host = s.DexURL.Host
|
|
r.URL.Scheme = s.DexURL.Scheme
|
|
r.Host = s.DexURL.Host
|
|
return s.T.RoundTrip(r)
|
|
}
|
|
|
|
func DexServerAddressWithProtocol(orig string, tlsConfig *DexTLSConfig) string {
|
|
if strings.Contains(orig, "://") {
|
|
return orig
|
|
}
|
|
if tlsConfig == nil || tlsConfig.DisableTLS {
|
|
return "http://" + orig
|
|
}
|
|
return "https://" + orig
|
|
}
|