Skip to content

BUGFIX: Zxporter cmd fix #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mutantkeyboard wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

BUGFIX: Zxporter cmd fix #302

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
169c415
fix: start health server before manager init to prevent 503 on upgrades
Feb 25, 2026
5e3a8c0
Remove the dobule initialization
Feb 26, 2026
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
57 changes: 30 additions & 27 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,29 +101,9 @@ func main() {
tlsOpts = append(tlsOpts, disableHTTP2)
}

webhookServer := webhook.NewServer(webhook.Options{
TLSOpts: tlsOpts,
})

// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.
// More info:
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.0/pkg/metrics/server
// - https://book.kubebuilder.io/reference/metrics.html
metricsServerOptions := metricsserver.Options{
BindAddress: metricsAddr,
SecureServing: secureMetrics,
TLSOpts: tlsOpts,
}

if secureMetrics {
// FilterProvider is used to protect the metrics endpoint with authn/authz.
// These configurations ensure that only authorized users and service accounts
// can access the metrics endpoint. The RBAC are configured in 'config/rbac/kustomization.yaml'. More info:
// https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.0/pkg/metrics/filters#WithAuthenticationAndAuthorization
metricsServerOptions.FilterProvider = filters.WithAuthenticationAndAuthorization
}

// Initialize HealthManager and register components
// Create HealthManager and start health server early so probes are
// answered immediately, before the (potentially slow) manager and
// controller initialisation.
healthManager := health.NewHealthManager()
healthManager.Register(health.ComponentCollectorManager)
healthManager.Register(health.ComponentBufferQueue)
Expand All @@ -135,10 +115,6 @@ func main() {
// reconciling before enforcing readiness checks.
healthManager.SuppressReadiness(2 * time.Minute)

// No need to add the standard controller with kubebuilder:scaffold:builder
// The env-based controller doesn't rely on CRDs

// New health server from health package
healthServer := health.NewHealthServer(healthManager, probeAddr)
if err := healthServer.Start(); err != nil {
setupLog.Error(err, "unable to start health server")
Expand All @@ -152,6 +128,30 @@ func main() {
}
}()

setupLog.Info("health server started, initializing manager")

webhookServer := webhook.NewServer(webhook.Options{
TLSOpts: tlsOpts,
})

// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.
// More info:
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.0/pkg/metrics/server
// - https://book.kubebuilder.io/reference/metrics.html
metricsServerOptions := metricsserver.Options{
BindAddress: metricsAddr,
SecureServing: secureMetrics,
TLSOpts: tlsOpts,
}

if secureMetrics {
// FilterProvider is used to protect the metrics endpoint with authn/authz.
// These configurations ensure that only authorized users and service accounts
// can access the metrics endpoint. The RBAC are configured in 'config/rbac/kustomization.yaml'. More info:
// https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.0/pkg/metrics/filters#WithAuthenticationAndAuthorization
metricsServerOptions.FilterProvider = filters.WithAuthenticationAndAuthorization
}

mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
Metrics: metricsServerOptions,
Expand Down Expand Up @@ -190,6 +190,9 @@ func main() {
os.Exit(1)
}

// No need to add the standard controller with kubebuilder:scaffold:builder
// The env-based controller doesn't rely on CRDs

setupLog.Info("starting manager")
if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
setupLog.Error(err, "problem running manager")
Expand Down