feat: moved to multicluster-provider #25
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ package cmd | |
| import ( | ||
| "context" | ||
| "crypto/tls" | ||
| "os" | ||
|
|
||
| kcpapis "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" | ||
| kcpcore "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" | ||
|
|
@@ -77,7 +78,20 @@ var listenCmd = &cobra.Command{ | |
| Run: func(cmd *cobra.Command, args []string) { | ||
| log.Info().Str("LogLevel", log.GetLevel().String()).Msg("Starting the Listener...") | ||
|
|
||
| // Set up signal handler and create a cancellable context for coordinated shutdown | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| // Error channel to distinguish error-triggered shutdown from normal signals | ||
| errCh := make(chan error, 1) | ||
|
|
||
| // Set up signal handling | ||
| signalCtx := ctrl.SetupSignalHandler() | ||
| go func() { | ||
| <-signalCtx.Done() | ||
| log.Info().Msg("received shutdown signal, initiating graceful shutdown") | ||
| cancel() | ||
| }() | ||
|
|
||
| restCfg := ctrl.GetConfigOrDie() | ||
|
|
||
| mgrOpts := ctrl.Options{ | ||
|
|
@@ -93,7 +107,8 @@ var listenCmd = &cobra.Command{ | |
| Scheme: scheme, | ||
| }) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("failed to create client from config") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| reconcilerOpts := reconciler.ReconcilerOpts{ | ||
|
|
@@ -105,44 +120,65 @@ var listenCmd = &cobra.Command{ | |
| } | ||
|
|
||
| // Create the appropriate reconciler based on configuration | ||
| var reconcilerInstance reconciler.ControllerProvider | ||
| if appCfg.EnableKcp { | ||
| kcpManager, err := kcp.NewKCPManager(appCfg, reconcilerOpts, log) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("unable to create KCP manager") | ||
| os.Exit(1) | ||
| } | ||
| reconcilerInstance = kcpManager | ||
|
|
||
| // Start virtual workspace watching if path is configured | ||
| if appCfg.Listener.VirtualWorkspacesConfigPath != "" { | ||
| go func() { | ||
| if err := kcpManager.StartVirtualWorkspaceWatching(ctx, appCfg.Listener.VirtualWorkspacesConfigPath); err != nil { | ||
| log.Error().Err(err).Msg("virtual workspace watching failed, initiating graceful shutdown") | ||
| select { | ||
| case errCh <- err: | ||
| default: | ||
| } | ||
| cancel() // Trigger coordinated shutdown | ||
| } | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }() | ||
| } | ||
| } else { | ||
| ioHandler, err := workspacefile.NewIOHandler(appCfg.OpenApiDefinitionsPath) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("unable to create IO handler") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| reconcilerInstance, err = clusteraccess.NewClusterAccessReconciler(ctx, appCfg, reconcilerOpts, ioHandler, apischema.NewResolver(log), log) | ||
| if err != nil { | ||
| log.Error().Err(err).Msg("unable to create cluster access reconciler") | ||
| os.Exit(1) | ||
| } | ||
| } | ||
|
|
||
| // Setup reconciler with its own manager and start everything | ||
| // Use the original context for the manager - it will be cancelled if watcher fails | ||
| if err := startManagerWithReconciler(ctx, reconcilerInstance); err != nil { | ||
| log.Error().Err(err).Msg("failed to start manager with reconciler") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| // Determine exit reason: error-triggered vs. normal signal | ||
| select { | ||
| case err := <-errCh: | ||
|
There was a problem hiding this comment. tbh i am not fully happy with the context and error handling, maybe we find a better solution in the future There was a problem hiding this comment. I can fix context propagation, but I am not sure what would you improve here in this select statement. There was a problem hiding this comment. Attention, untested: This could be an idea using Run: func(cmd *cobra.Command, args []string) {
log.Info().Str("LogLevel", log.GetLevel().String()).Msg("Starting the Listener...")
// Set up signal handling
signalCtx := ctrl.SetupSignalHandler()
ctx, cancel := context.WithCancel(signalCtx)
defer cancel()
restCfg := ctrl.GetConfigOrDie()
mgrOpts := ctrl.Options{
Scheme: scheme,
Metrics: metricsServerOptions,
WebhookServer: webhookServer,
HealthProbeBindAddress: defaultCfg.HealthProbeBindAddress,
LeaderElection: defaultCfg.LeaderElection.Enabled,
LeaderElectionID: "72231e1f.platform-mesh.io",
}
clt, err := client.New(restCfg, client.Options{
Scheme: scheme,
})
if err != nil {
log.Fatal().Err(err).Msg("failed to create client from config")
}
reconcilerOpts := reconciler.ReconcilerOpts{
Scheme: scheme,
Client: clt,
Config: restCfg,
ManagerOpts: mgrOpts,
OpenAPIDefinitionsPath: appCfg.OpenApiDefinitionsPath,
}
eg, eCtx := errgroup.WithContext(ctx)
// Create the appropriate reconciler based on configuration
var reconcilerInstance reconciler.ControllerProvider
if appCfg.EnableKcp {
kcpManager, err := kcp.NewKCPManager(appCfg, reconcilerOpts, log)
if err != nil {
log.Fatal().Err(err).Msg("unable to create KCP manager")
}
reconcilerInstance = kcpManager
// Start virtual workspace watching if path is configured
if appCfg.Listener.VirtualWorkspacesConfigPath != "" {
eg.Go(func() error {
if err := kcpManager.StartVirtualWorkspaceWatching(eCtx, appCfg.Listener.VirtualWorkspacesConfigPath); err != nil {
return err
}
return nil
})
}
} else {
ioHandler, err := workspacefile.NewIOHandler(appCfg.OpenApiDefinitionsPath)
if err != nil {
log.Fatal().Err(err).Msg("unable to create IO handler")
}
reconcilerInstance, err = clusteraccess.NewClusterAccessReconciler(ctx, appCfg, reconcilerOpts, ioHandler, apischema.NewResolver(log), log)
if err != nil {
log.Fatal().Err(err).Msg("unable to create cluster access reconciler")
}
}
// Setup reconciler with its own manager and start everything
// Use the original context for the manager - it will be cancelled if watcher fails
eg.Go(func() error {
if err := startManagerWithReconciler(eCtx, reconcilerInstance); err != nil {
log.Error().Err(err).Msg("failed to start manager with reconciler")
return err
}
return nil
})
err = eg.Wait()
if err != nil {
log.Fatal().Err(err).Msg("exiting due to critical component failure")
}
log.Info().Msg("graceful shutdown complete")
},Maybe we don't even need our own context and can only use the signal context. The errgroup returns it's own context that is cancelled if one function returns with an error. There was a problem hiding this comment. I will also do it in this issue: |
||
| if err != nil { | ||
| log.Error().Err(err).Msg("exiting due to critical component failure") | ||
| os.Exit(1) | ||
| } | ||
| default: | ||
| // Normal, graceful shutdown via signal | ||
| log.Info().Msg("graceful shutdown complete") | ||
| } | ||
| }, | ||
| } | ||
|
|
||
| // startManagerWithReconciler handles the common manager setup and start operations | ||
| func startManagerWithReconciler(ctx context.Context, reconciler reconciler.ControllerProvider) error { | ||
| mgr := reconciler.GetManager() | ||
|
|
||
| if err := reconciler.SetupWithManager(mgr); err != nil { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just out of curiosity: What is the reason to switch to
log.Error()aslog.Fatal()also das theos.Exit(1)- is it the log level?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After your comment I double checked the behavior and log.Fatal does basically the same as log.Error + os.Exit, but it additionally it flushes any buffered messages.
Replaced log.Error + os.Exit with log.Fatal