From bfd9d3c60be9d3b74e36e21a3f802556b7abb463 Mon Sep 17 00:00:00 2001 From: Ansh Garhewal Date: Sun, 21 Jul 2024 09:18:14 +0530 Subject: [PATCH] fix: manager for controller --- internal/controller/jenkins_controller.go | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/internal/controller/jenkins_controller.go b/internal/controller/jenkins_controller.go index 4643d9b5..66f7846b 100644 --- a/internal/controller/jenkins_controller.go +++ b/internal/controller/jenkins_controller.go @@ -46,7 +46,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" ) type reconcileError struct { @@ -79,10 +78,22 @@ type JenkinsReconciler struct { // SetupWithManager sets up the controller with the Manager. func (r *JenkinsReconciler) SetupWithManager(mgr ctrl.Manager) error { jenkinsHandler := &enqueueRequestForJenkins{} - // configMapResource := &source.Kind{Type: &corev1.ConfigMap{TypeMeta: metav1.TypeMeta{APIVersion: APIVersion, Kind: ConfigMapKind}}} - configMapResource := source.Kind(mgr.GetCache(), internal.Kind()) - secretResource := &source.Kind{Type: &corev1.Secret{TypeMeta: metav1.TypeMeta{APIVersion: APIVersion, Kind: SecretKind}}} - decorator := jenkinsDecorator{handler: &handler.EnqueueRequestForObject{}} + configMapResource := &corev1.Secret{ + TypeMeta: metav1.TypeMeta{ + APIVersion: APIVersion, + Kind: SecretKind, + }, + } + secretResource := &corev1.Secret{ + TypeMeta: metav1.TypeMeta{ + APIVersion: APIVersion, + Kind: SecretKind, + }, + } + decorator := jenkinsDecorator{ + handler: &handler.EnqueueRequestForObject{}, + } + return ctrl.NewControllerManagedBy(mgr). For(&v1alpha2.Jenkins{}). Owns(&corev1.Pod{}). @@ -90,7 +101,7 @@ func (r *JenkinsReconciler) SetupWithManager(mgr ctrl.Manager) error { Owns(&corev1.ConfigMap{}). Watches(secretResource, jenkinsHandler). Watches(configMapResource, jenkinsHandler). - Watches(&source.Kind{Type: &v1alpha2.Jenkins{}}, &decorator). + Watches(&v1alpha2.Jenkins{}, &decorator). Complete(r) }