Skip to content

Commit

Permalink
chore: fixes typos in func names (opendatahub-io#715)
Browse files Browse the repository at this point in the history
  • Loading branch information
bartoszmajsak authored Nov 9, 2023
1 parent a1521bf commit 18b00eb
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions controllers/dscinitialization/dscinitialization_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,12 @@ func (r *DSCInitializationReconciler) SetupWithManager(mgr ctrl.Manager) error {
Owns(&corev1.ServiceAccount{}, builder.WithPredicates(predicate.Or(predicate.GenerationChangedPredicate{}, predicate.LabelChangedPredicate{}))).
Owns(&corev1.Service{}, builder.WithPredicates(predicate.Or(predicate.GenerationChangedPredicate{}, predicate.LabelChangedPredicate{}))).
Owns(&routev1.Route{}, builder.WithPredicates(predicate.Or(predicate.GenerationChangedPredicate{}, predicate.LabelChangedPredicate{}))).
Watches(&source.Kind{Type: &dscv1.DataScienceCluster{}}, handler.EnqueueRequestsFromMapFunc(r.watchDSCResrouce), builder.WithPredicates(DSCDeletionPredicate)).
Watches(&source.Kind{Type: &corev1.Secret{}}, handler.EnqueueRequestsFromMapFunc(r.watchMonitoringSecretResrouce), builder.WithPredicates(SecretContentChangedPredicate)).
Watches(&source.Kind{Type: &corev1.ConfigMap{}}, handler.EnqueueRequestsFromMapFunc(r.watchMonitoringConfigMapResrouce), builder.WithPredicates(CMContentChangedPredicate)).
Watches(&source.Kind{Type: &dscv1.DataScienceCluster{}}, handler.EnqueueRequestsFromMapFunc(r.watchDSCResource), builder.WithPredicates(DSCDeletionPredicate)).
Watches(&source.Kind{Type: &corev1.Secret{}}, handler.EnqueueRequestsFromMapFunc(r.watchMonitoringSecretResource), builder.WithPredicates(SecretContentChangedPredicate)).
Watches(&source.Kind{Type: &corev1.ConfigMap{}}, handler.EnqueueRequestsFromMapFunc(r.watchMonitoringConfigMapResource), builder.WithPredicates(CMContentChangedPredicate)).
Complete(r)
}

func (r *DSCInitializationReconciler) updateStatus(ctx context.Context, original *dsciv1.DSCInitialization, update func(saved *dsciv1.DSCInitialization),
) (*dsciv1.DSCInitialization, error) {
saved := &dsciv1.DSCInitialization{}
Expand All @@ -341,6 +342,7 @@ var SecretContentChangedPredicate = predicate.Funcs{
return !reflect.DeepEqual(oldSecret.Data, newSecret.Data)
},
}

var CMContentChangedPredicate = predicate.Funcs{
UpdateFunc: func(e event.UpdateEvent) bool {
oldCM := e.ObjectOld.(*corev1.ConfigMap)
Expand All @@ -357,7 +359,7 @@ var DSCDeletionPredicate = predicate.Funcs{
},
}

func (r *DSCInitializationReconciler) watchMonitoringConfigMapResrouce(a client.Object) (requests []reconcile.Request) {
func (r *DSCInitializationReconciler) watchMonitoringConfigMapResource(a client.Object) (requests []reconcile.Request) {
if a.GetName() == "prometheus" && a.GetNamespace() == "redhat-ods-monitoring" {
r.Log.Info("Found monitoring configmap has updated, start reconcile")

Expand All @@ -367,7 +369,7 @@ func (r *DSCInitializationReconciler) watchMonitoringConfigMapResrouce(a client.
}
}

func (r *DSCInitializationReconciler) watchMonitoringSecretResrouce(a client.Object) (requests []reconcile.Request) {
func (r *DSCInitializationReconciler) watchMonitoringSecretResource(a client.Object) (requests []reconcile.Request) {
operatorNs, err := upgrade.GetOperatorNamespace()
if err != nil {
return nil
Expand All @@ -381,7 +383,7 @@ func (r *DSCInitializationReconciler) watchMonitoringSecretResrouce(a client.Obj
}
}

func (r *DSCInitializationReconciler) watchDSCResrouce(_ client.Object) (requests []reconcile.Request) {
func (r *DSCInitializationReconciler) watchDSCResource(_ client.Object) (requests []reconcile.Request) {
instanceList := &dscv1.DataScienceClusterList{}
if err := r.Client.List(context.TODO(), instanceList); err != nil {
// do not handle if cannot get list
Expand Down

0 comments on commit 18b00eb

Please sign in to comment.