Skip to content

fix: implement graceful shutdown respecting OS signals #505

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

Open
Ajpantuso wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: implement graceful shutdown respecting OS signals #505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 33 additions & 4 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ import (
"net"
"net/http"
"os"
"time"

"github.com/openshift/operator-custom-metrics/pkg/metrics"
klog "k8s.io/klog/v2"
"k8s.io/klog/v2/klogr"
logf "sigs.k8s.io/controller-runtime/pkg/log"
ctrl "sigs.k8s.io/controller-runtime/pkg/manager/signals"

"github.com/openshift/managed-cluster-validating-webhooks/config"
"github.com/openshift/managed-cluster-validating-webhooks/pkg/dispatcher"
Expand Down Expand Up @@ -75,6 +77,8 @@ func main() {
WithCollectors(localmetrics.MetricsList).
GetConfig()

ctx := ctrl.SetupSignalHandler()

// get the namespace we're running in to confirm if running in a cluster
if _, err := k8sutil.GetOperatorNamespace(); err != nil {
if errors.Is(err, k8sutil.ErrRunLocal) {
Expand All @@ -83,7 +87,7 @@ func main() {
log.Error(err, "Failed to get operator namespace")
}
} else {
if err := metrics.ConfigureMetrics(context.TODO(), *metricsServer); err != nil {
if err := metrics.ConfigureMetrics(ctx, *metricsServer); err != nil {
log.Error(err, "Failed to configure metrics")
} else {
log.Info("Successfully configured metrics")
Expand All @@ -105,8 +109,33 @@ func main() {
server.TLSConfig = &tls.Config{
RootCAs: certpool,
}
log.Error(server.ListenAndServeTLS(*tlsCert, *tlsKey), "Error serving TLS")
} else {
log.Error(server.ListenAndServe(), "Error serving non-TLS connection")
}

// Start server in background
errCh := make(chan error, 1)
go func() {
if *useTLS {
errCh <- server.ListenAndServeTLS(*tlsCert, *tlsKey)
} else {
errCh <- server.ListenAndServe()
}
}()

// Wait for signal or server error
select {
case err := <-errCh:
log.Error(err, "Server failed")
os.Exit(1)
case <-ctx.Done():
log.Info("Shutdown signal received, draining connections")
}

shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()

if err := server.Shutdown(shutdownCtx); err != nil {
log.Error(err, "Server shutdown error")
os.Exit(1)
}
log.Info("Server stopped gracefully")
}