Skip to content

fix: remove deprecated field of manager option #684

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

Merged
aymericDD merged 5 commits into from
Sep 1, 2023
+14 −4
Merged

fix: remove deprecated field of manager option #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c153891
fix: remove deprecated field of manager option
aymericDD Apr 4, 2023
e0d2e84
feat: reinstate broadcaster option, add broadcaster.Shutdown
aymericDD Jul 21, 2023
a2d9fe7
WIP: POC notifier + manager broadcasters split
aymericDD Jul 21, 2023
9e9eb8e
Merge branch 'main' into fix/deprecated
aymericDD Aug 23, 2023
96366d6
Merge branch 'main' into fix/deprecated
aymericDD Aug 29, 2023
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
5 changes: 5 additions & 0 deletions eventbroadcaster/notifiersink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
notifTypes "github.com/DataDog/chaos-controller/eventnotifier/types"
"go.uber.org/zap"

corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
ctrl "sigs.k8s.io/controller-runtime"

corev1 "k8s.io/api/core/v1"
Expand All @@ -40,6 +41,10 @@ func RegisterNotifierSinks(mgr ctrl.Manager, broadcaster record.EventBroadcaster
broadcaster.StartRecordingToSink(&NotifierSink{client: client, notifier: notifier, logger: logger})
}

corev1Client, _ := corev1client.NewForConfig(mgr.GetConfig())
Copy link
Contributor Author

@aymericDD aymericDD Apr 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part of code can be removed if we don't need to send event to kubernetes.


broadcaster.StartRecordingToSink(&corev1client.EventSinkImpl{Interface: corev1Client.Events("")})

return
}

Expand Down
13 changes: 9 additions & 4 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/DataDog/chaos-controller/utils"
"github.com/DataDog/chaos-controller/watchers"
chaoswebhook "github.com/DataDog/chaos-controller/webhook"
corev1 "k8s.io/api/core/v1"

"k8s.io/apimachinery/pkg/runtime"
kubeinformers "k8s.io/client-go/informers"
Expand Down Expand Up @@ -75,22 +76,22 @@ func main() {
logger.Fatalw("unable to create a valid configuration", "error", err)
}

broadcaster := eventbroadcaster.EventBroadcaster()

mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
Scheme: scheme,
MetricsBindAddress: cfg.Controller.MetricsBindAddr,
LeaderElection: cfg.Controller.LeaderElection,
LeaderElectionID: "75ec2fa4.datadoghq.com",
EventBroadcaster: broadcaster,
Host: cfg.Controller.Webhook.Host,
Port: cfg.Controller.Webhook.Port,
CertDir: cfg.Controller.Webhook.CertDir,
})

if err != nil {
logger.Fatalw("unable to start manager", "error", err)
}

broadcaster := eventbroadcaster.EventBroadcaster()

// event notifiers
err = eventbroadcaster.RegisterNotifierSinks(mgr, broadcaster, cfg.Controller.Notifiers, logger)
if err != nil {
Expand Down Expand Up @@ -168,7 +169,7 @@ func main() {
Client: mgr.GetClient(),
BaseLog: logger,
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor(chaosv1beta1.SourceDisruptionComponent),
Recorder: broadcaster.NewRecorder(mgr.GetScheme(), corev1.EventSource{Component: chaosv1beta1.SourceDisruptionComponent}),
MetricsSink: metricsSink,
TracerSink: tracerSink,
TargetSelector: targetSelector,
Expand Down Expand Up @@ -363,6 +364,10 @@ func main() {
},
})

// for safety purposes: as long as no event is emitted and mgr.Start(ctx.Context) isn't
// called, the broadcaster isn't actually initiated
defer broadcaster.Shutdown()

// erase/close caches contexts
defer func() {
for _, contextTuple := range disruptionReconciler.CacheContextStore {
Expand Down