Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions k8s/vizier/bootstrap/adaptive_export_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,24 @@ spec:
# value: "changeme-ingest"
# - name: CLICKHOUSE_DATABASE
# value: "forensic_db"
# TLS for the control surface (CONTROL_TLS=true). server.crt/key from the
# same service-tls-certs secret the broker/PEM use; without this the dx
# bearer JWT crosses the CNI in cleartext. Harmless when control is off.
volumeMounts:
- name: certs
mountPath: /certs
readOnly: true
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
seccompProfile:
type: RuntimeDefault
volumes:
- name: certs
secret:
secretName: service-tls-certs
securityContext:
runAsUser: 10100
runAsGroup: 10100
Expand Down
23 changes: 21 additions & 2 deletions src/vizier/services/adaptive_export/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -600,8 +600,27 @@ func main() {
}
go func() {
log.WithField("addr", addr).Info("control surface listening")
if err := httpSrv.ListenAndServe(); err != nil &&
err != http.ErrServerClosed {
// CONTROL_TLS=true → serve TLS so the bearer JWT + control payloads
// don't cross the CNI in cleartext (auth without TLS leaks the token).
// Cert/key from the service-tls-certs secret the broker/PEM already use
// (mounted /certs); dx skip-verifies. Default-OFF for incremental rollout.
var err error
if os.Getenv("CONTROL_TLS") == "true" {
cert := os.Getenv("CONTROL_TLS_CERT")
if cert == "" {
cert = "/certs/server.crt"
}
key := os.Getenv("CONTROL_TLS_KEY")
if key == "" {
key = "/certs/server.key"
}
log.WithField("cert", cert).Info("control surface: TLS ENABLED")
err = httpSrv.ListenAndServeTLS(cert, key)
} else {
log.Warn("control surface: TLS DISABLED — bearer JWT crosses the CNI in cleartext (set CONTROL_TLS=true)")
err = httpSrv.ListenAndServe()
}
if err != nil && err != http.ErrServerClosed {
log.WithError(err).Error("control surface stopped")
}
}()
Expand Down
Loading