Skip to content
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.

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

feat: allow adding extra reconcilers to odiglet #785

Merged
merged 3 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions cli/cmd/resources/odiglet.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,17 @@ func NewOdigletClusterRole(psp bool) *rbacv1.ClusterRole {
"namespaces",
},
},
{
Verbs: []string{
"get",
"list",
"watch",
},
APIGroups: []string{"odigos.io"},
Resources: []string{
"instrumentationconfigs",
},
},
},
}

Expand Down
15 changes: 13 additions & 2 deletions odiglet/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,20 @@ func main() {

go startDeviceManager(clientset)

ctx := signals.SetupSignalHandler()
mgr, err := kube.CreateManager()
if err != nil {
log.Logger.Error(err, "Failed to create controller-runtime manager")
os.Exit(-1)
}

err = kube.StartReconciling(ctx, ebpfDirectors)
err = kube.SetupWithManager(mgr, ebpfDirectors)
if err != nil {
log.Logger.Error(err, "Failed to setup controller-runtime manager")
os.Exit(-1)
}

ctx := signals.SetupSignalHandler()
err = kube.StartManager(ctx, mgr)
if err != nil {
log.Logger.Error(err, "Failed to start controller-runtime manager")
os.Exit(-1)
Expand Down
29 changes: 16 additions & 13 deletions odiglet/pkg/kube/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,30 @@ func init() {
utilruntime.Must(odigosv1.AddToScheme(scheme))
}

func StartReconciling(ctx context.Context, ebpfDirectors map[common.ProgrammingLanguage]ebpf.Director) error {
func CreateManager() (ctrl.Manager, error) {
log.Logger.V(0).Info("Starting reconcileres for runtime details")
ctrl.SetLogger(log.Logger)
mgr, err := manager.New(config.GetConfigOrDie(), manager.Options{
return manager.New(config.GetConfigOrDie(), manager.Options{
Scheme: scheme,
Metrics: metricsserver.Options{
BindAddress: "0",
},
})
if err != nil {
return err
}
}

func StartManager(ctx context.Context, mgr ctrl.Manager) error {
go func() {
err := mgr.Start(ctx)
if err != nil {
log.Logger.Error(err, "error starting kube manager")
}
}()

err = runtime_details.SetupWithManager(mgr)
return nil
}

func SetupWithManager(mgr ctrl.Manager, ebpfDirectors map[common.ProgrammingLanguage]ebpf.Director) error {
err := runtime_details.SetupWithManager(mgr)
if err != nil {
return err
}
Expand All @@ -51,12 +61,5 @@ func StartReconciling(ctx context.Context, ebpfDirectors map[common.ProgrammingL
return err
}

go func() {
err := mgr.Start(ctx)
if err != nil {
log.Logger.Error(err, "error starting kube manager")
}
}()

return nil
}