Skip to content

Draft: migrate events to recorder #1653

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
Igor-splunk wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Draft: migrate events to recorder #1653

Show file tree
Hide file tree
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
44 changes: 26 additions & 18 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ func main() {
// as certificates issued by a trusted Certificate Authority (CA). The primary risk is potentially allowing
// unauthorized access to sensitive metrics data. Consider replacing with CertDir, CertName, and KeyName
// to provide certificates, ensuring the server communicates using trusted and secure certificates.
TLSOpts: tlsOpts,
TLSOpts: tlsOpts,
FilterProvider: filters.WithAuthenticationAndAuthorization,
}

// TODO: enable https for /metrics endpoint by default
// TODO: enable https for /metrics endpoint by default
// if secureMetrics {
// // FilterProvider is used to protect the metrics endpoint with authn/authz.
// // These configurations ensure that only authorized users and service accounts
Expand Down Expand Up @@ -164,59 +164,67 @@ func main() {
}

if err = (&intController.ClusterManagerReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("clustermanager-controller"),
}).SetupWithManager(mgr); err != nil {
fmt.Printf(" error - %v", err)
setupLog.Error(err, "unable to create controller", "controller", "ClusterManager ")
os.Exit(1)
}
fmt.Printf("%v", err)
if err = (&intController.ClusterMasterReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("clustermaster-controller"),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ClusterMaster")
os.Exit(1)
}
if err = (&intController.IndexerClusterReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("indexercluster-controller"),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "IndexerCluster")
os.Exit(1)
}
if err = (&intController.LicenseMasterReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("licensemaster-controller"),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "LicenseMaster")
os.Exit(1)
}
if err = (&intController.LicenseManagerReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("licensemanager-controller"),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "LicenseManager")
os.Exit(1)
}
if err = (&intController.MonitoringConsoleReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("monitoringconsole-controller"),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "MonitoringConsole")
os.Exit(1)
}
if err = (&intController.SearchHeadClusterReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("searchheadcluster-controller"),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "SearchHeadCluster")
os.Exit(1)
}
if err = (&intController.StandaloneReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("standalone-controller"),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "Standalone")
os.Exit(1)
Expand Down
8 changes: 7 additions & 1 deletion internal/controller/clustermanager_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

enterpriseApi "github.com/splunk/splunk-operator/api/v4"
"github.com/splunk/splunk-operator/internal/controller/common"
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"

"github.com/pkg/errors"
metrics "github.com/splunk/splunk-operator/pkg/splunk/client/metrics"
Expand All @@ -30,6 +31,7 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
Expand All @@ -42,7 +44,8 @@ import (
// ClusterManagerReconciler reconciles a ClusterManager object
type ClusterManagerReconciler struct {
client.Client
Scheme *runtime.Scheme
Scheme *runtime.Scheme
Recorder record.EventRecorder
}

//+kubebuilder:rbac:groups=enterprise.splunk.com,resources=clustermanagers,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -103,6 +106,9 @@ func (r *ClusterManagerReconciler) Reconcile(ctx context.Context, req ctrl.Reque

reqLogger.Info("start", "CR version", instance.GetResourceVersion())

// Pass event recorder through context
ctx = context.WithValue(ctx, splcommon.EventRecorderKey, r.Recorder)

result, err := ApplyClusterManager(ctx, r.Client, instance)
if result.Requeue && result.RequeueAfter != 0 {
reqLogger.Info("Requeued", "period(seconds)", int(result.RequeueAfter/time.Second))
Expand Down
8 changes: 7 additions & 1 deletion internal/controller/clustermaster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

enterpriseApi "github.com/splunk/splunk-operator/api/v4"
"github.com/splunk/splunk-operator/internal/controller/common"
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"

"github.com/pkg/errors"
enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
Expand All @@ -31,6 +32,7 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
Expand All @@ -43,7 +45,8 @@ import (
// ClusterMasterReconciler reconciles a ClusterMaster object
type ClusterMasterReconciler struct {
client.Client
Scheme *runtime.Scheme
Scheme *runtime.Scheme
Recorder record.EventRecorder
}

//+kubebuilder:rbac:groups=enterprise.splunk.com,resources=clustermasters,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -104,6 +107,9 @@ func (r *ClusterMasterReconciler) Reconcile(ctx context.Context, req ctrl.Reques

reqLogger.Info("start", "CR version", instance.GetResourceVersion())

// Pass event recorder through context
ctx = context.WithValue(ctx, splcommon.EventRecorderKey, r.Recorder)

result, err := ApplyClusterMaster(ctx, r.Client, instance)
if result.Requeue && result.RequeueAfter != 0 {
reqLogger.Info("Requeued", "period(seconds)", int(result.RequeueAfter/time.Second))
Expand Down
8 changes: 7 additions & 1 deletion internal/controller/indexercluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ import (
"github.com/pkg/errors"
enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
metrics "github.com/splunk/splunk-operator/pkg/splunk/client/metrics"
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"
enterprise "github.com/splunk/splunk-operator/pkg/splunk/enterprise"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
Expand All @@ -43,7 +45,8 @@ import (
// IndexerClusterReconciler reconciles a IndexerCluster object
type IndexerClusterReconciler struct {
client.Client
Scheme *runtime.Scheme
Scheme *runtime.Scheme
Recorder record.EventRecorder
}

//+kubebuilder:rbac:groups=enterprise.splunk.com,resources=indexerclusters,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -103,6 +106,9 @@ func (r *IndexerClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reque

reqLogger.Info("start", "CR version", instance.GetResourceVersion())

// Pass event recorder through context
ctx = context.WithValue(ctx, splcommon.EventRecorderKey, r.Recorder)

result, err := ApplyIndexerCluster(ctx, r.Client, instance)
if result.Requeue && result.RequeueAfter != 0 {
reqLogger.Info("Requeued", "period(seconds)", int(result.RequeueAfter/time.Second))
Expand Down
8 changes: 7 additions & 1 deletion internal/controller/licensemanager_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

enterpriseApi "github.com/splunk/splunk-operator/api/v4"
"github.com/splunk/splunk-operator/internal/controller/common"
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"

"github.com/pkg/errors"
metrics "github.com/splunk/splunk-operator/pkg/splunk/client/metrics"
Expand All @@ -30,6 +31,7 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
Expand All @@ -42,7 +44,8 @@ import (
// LicenseManagerReconciler reconciles a LicenseManager object
type LicenseManagerReconciler struct {
client.Client
Scheme *runtime.Scheme
Scheme *runtime.Scheme
Recorder record.EventRecorder
}

//+kubebuilder:rbac:groups=enterprise.splunk.com,resources=licensemanagers,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -102,6 +105,9 @@ func (r *LicenseManagerReconciler) Reconcile(ctx context.Context, req ctrl.Reque

reqLogger.Info("start", "CR version", instance.GetResourceVersion())

// Pass event recorder through context
ctx = context.WithValue(ctx, splcommon.EventRecorderKey, r.Recorder)

result, err := ApplyLicenseManager(ctx, r.Client, instance)
if result.Requeue && result.RequeueAfter != 0 {
reqLogger.Info("Requeued", "period(seconds)", int(result.RequeueAfter/time.Second))
Expand Down
8 changes: 7 additions & 1 deletion internal/controller/licensemaster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"time"

"github.com/splunk/splunk-operator/internal/controller/common"
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"

"github.com/pkg/errors"
enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
Expand All @@ -31,6 +32,7 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
Expand All @@ -43,7 +45,8 @@ import (
// LicenseMasterReconciler reconciles a LicenseMaster object
type LicenseMasterReconciler struct {
client.Client
Scheme *runtime.Scheme
Scheme *runtime.Scheme
Recorder record.EventRecorder
}

//+kubebuilder:rbac:groups=enterprise.splunk.com,resources=licensemasters,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -103,6 +106,9 @@ func (r *LicenseMasterReconciler) Reconcile(ctx context.Context, req ctrl.Reques

reqLogger.Info("start", "CR version", instance.GetResourceVersion())

// Pass event recorder through context
ctx = context.WithValue(ctx, splcommon.EventRecorderKey, r.Recorder)

result, err := ApplyLicenseMaster(ctx, r.Client, instance)
if result.Requeue && result.RequeueAfter != 0 {
reqLogger.Info("Requeued", "period(seconds)", int(result.RequeueAfter/time.Second))
Expand Down
8 changes: 7 additions & 1 deletion internal/controller/monitoringconsole_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

enterpriseApi "github.com/splunk/splunk-operator/api/v4"
"github.com/splunk/splunk-operator/internal/controller/common"
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"

"github.com/pkg/errors"
enterpriseApiV3 "github.com/splunk/splunk-operator/api/v3"
Expand All @@ -31,6 +32,7 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
Expand All @@ -43,7 +45,8 @@ import (
// MonitoringConsoleReconciler reconciles a MonitoringConsole object
type MonitoringConsoleReconciler struct {
client.Client
Scheme *runtime.Scheme
Scheme *runtime.Scheme
Recorder record.EventRecorder
}

//+kubebuilder:rbac:groups=enterprise.splunk.com,resources=monitoringconsoles,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -102,6 +105,9 @@ func (r *MonitoringConsoleReconciler) Reconcile(ctx context.Context, req ctrl.Re

reqLogger.Info("start", "CR version", instance.GetResourceVersion())

// Pass event recorder through context
ctx = context.WithValue(ctx, splcommon.EventRecorderKey, r.Recorder)

result, err := ApplyMonitoringConsole(ctx, r.Client, instance)
if result.Requeue && result.RequeueAfter != 0 {
reqLogger.Info("Requeued", "period(seconds)", int(result.RequeueAfter/time.Second))
Expand Down
8 changes: 7 additions & 1 deletion internal/controller/searchheadcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

enterpriseApi "github.com/splunk/splunk-operator/api/v4"
"github.com/splunk/splunk-operator/internal/controller/common"
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"

"github.com/pkg/errors"
metrics "github.com/splunk/splunk-operator/pkg/splunk/client/metrics"
Expand All @@ -30,6 +31,7 @@ import (
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
Expand All @@ -42,7 +44,8 @@ import (
// SearchHeadClusterReconciler reconciles a SearchHeadCluster object
type SearchHeadClusterReconciler struct {
client.Client
Scheme *runtime.Scheme
Scheme *runtime.Scheme
Recorder record.EventRecorder
}

//+kubebuilder:rbac:groups=enterprise.splunk.com,resources=searchheadclusters,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -102,6 +105,9 @@ func (r *SearchHeadClusterReconciler) Reconcile(ctx context.Context, req ctrl.Re

reqLogger.Info("start", "CR version", instance.GetResourceVersion())

// Pass event recorder through context
ctx = context.WithValue(ctx, splcommon.EventRecorderKey, r.Recorder)

result, err := ApplySearchHeadCluster(ctx, r.Client, instance)
if result.Requeue && result.RequeueAfter != 0 {
reqLogger.Info("Requeued", "period(seconds)", int(result.RequeueAfter/time.Second))
Expand Down
8 changes: 7 additions & 1 deletion internal/controller/standalone_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ import (

enterpriseApi "github.com/splunk/splunk-operator/api/v4"
"github.com/splunk/splunk-operator/internal/controller/common"
splcommon "github.com/splunk/splunk-operator/pkg/splunk/common"

appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/tools/record"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
Expand All @@ -47,7 +49,8 @@ const (
// StandaloneReconciler reconciles a Standalone object
type StandaloneReconciler struct {
client.Client
Scheme *runtime.Scheme
Scheme *runtime.Scheme
Recorder record.EventRecorder
}

//+kubebuilder:rbac:groups=enterprise.splunk.com,resources=standalones,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -107,6 +110,9 @@ func (r *StandaloneReconciler) Reconcile(ctx context.Context, req ctrl.Request)

reqLogger.Info("start", "CR version", instance.GetResourceVersion())

// Pass event recorder through context
ctx = context.WithValue(ctx, splcommon.EventRecorderKey, r.Recorder)

result, err := ApplyStandalone(ctx, r.Client, instance)
if result.Requeue && result.RequeueAfter != 0 {
reqLogger.Info("Requeued", "period(seconds)", int(result.RequeueAfter/time.Second))
Expand Down
1 change: 1 addition & 0 deletions pkg/splunk/common/names.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ const (
var AppDownloadVolume string = "/opt/splunk/appframework/"

var EventPublisherKey contextKey = "eventPublisher"
var EventRecorderKey contextKey = "eventRecorder"

// GetVersionedSecretName returns a versioned secret name
func GetVersionedSecretName(versionedSecretIdentifier string, version string) string {
Expand Down
Loading
Loading