Skip to content

Commit 39be04c

Browse files
committed
fix: exit code 0 on clean shutdown
Signed-off-by: Leonardo Cecchi <[email protected]>
1 parent afd4603 commit 39be04c

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

internal/cnpgi/instance/manager.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package instance
22

33
import (
44
"context"
5+
"errors"
56
"os"
67
"path"
78

@@ -94,6 +95,10 @@ func Start(ctx context.Context) error {
9495
}
9596

9697
if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
98+
if errors.Is(err, context.Canceled) {
99+
return nil
100+
}
101+
97102
setupLog.Error(err, "problem running manager")
98103
return err
99104
}

internal/cnpgi/operator/manager.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package operator
1919
import (
2020
"context"
2121
"crypto/tls"
22+
"errors"
2223

2324
// +kubebuilder:scaffold:imports
2425
cnpgv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
@@ -155,6 +156,10 @@ func Start(ctx context.Context) error {
155156

156157
setupLog.Info("starting manager")
157158
if err := mgr.Start(ctx); err != nil {
159+
if errors.Is(err, context.Canceled) {
160+
return nil
161+
}
162+
158163
setupLog.Error(err, "problem running manager")
159164
return err
160165
}

internal/cnpgi/restore/manager.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package restore
22

33
import (
44
"context"
5+
"errors"
56
"os"
67

78
cnpgv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
@@ -93,6 +94,9 @@ func Start(ctx context.Context) error {
9394
}
9495

9596
if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
97+
if errors.Is(err, context.Canceled) {
98+
return nil
99+
}
96100
setupLog.Error(err, "problem running manager")
97101
return err
98102
}

0 commit comments

Comments
 (0)