fix: manager for controller
This commit is contained in:
parent
b7f4e25b71
commit
bfd9d3c60b
|
|
@ -46,7 +46,6 @@ import (
|
||||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/handler"
|
"sigs.k8s.io/controller-runtime/pkg/handler"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
"sigs.k8s.io/controller-runtime/pkg/reconcile"
|
||||||
"sigs.k8s.io/controller-runtime/pkg/source"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type reconcileError struct {
|
type reconcileError struct {
|
||||||
|
|
@ -79,10 +78,22 @@ type JenkinsReconciler struct {
|
||||||
// SetupWithManager sets up the controller with the Manager.
|
// SetupWithManager sets up the controller with the Manager.
|
||||||
func (r *JenkinsReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
func (r *JenkinsReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
||||||
jenkinsHandler := &enqueueRequestForJenkins{}
|
jenkinsHandler := &enqueueRequestForJenkins{}
|
||||||
// configMapResource := &source.Kind{Type: &corev1.ConfigMap{TypeMeta: metav1.TypeMeta{APIVersion: APIVersion, Kind: ConfigMapKind}}}
|
configMapResource := &corev1.Secret{
|
||||||
configMapResource := source.Kind(mgr.GetCache(), internal.Kind())
|
TypeMeta: metav1.TypeMeta{
|
||||||
secretResource := &source.Kind{Type: &corev1.Secret{TypeMeta: metav1.TypeMeta{APIVersion: APIVersion, Kind: SecretKind}}}
|
APIVersion: APIVersion,
|
||||||
decorator := jenkinsDecorator{handler: &handler.EnqueueRequestForObject{}}
|
Kind: SecretKind,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
secretResource := &corev1.Secret{
|
||||||
|
TypeMeta: metav1.TypeMeta{
|
||||||
|
APIVersion: APIVersion,
|
||||||
|
Kind: SecretKind,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
decorator := jenkinsDecorator{
|
||||||
|
handler: &handler.EnqueueRequestForObject{},
|
||||||
|
}
|
||||||
|
|
||||||
return ctrl.NewControllerManagedBy(mgr).
|
return ctrl.NewControllerManagedBy(mgr).
|
||||||
For(&v1alpha2.Jenkins{}).
|
For(&v1alpha2.Jenkins{}).
|
||||||
Owns(&corev1.Pod{}).
|
Owns(&corev1.Pod{}).
|
||||||
|
|
@ -90,7 +101,7 @@ func (r *JenkinsReconciler) SetupWithManager(mgr ctrl.Manager) error {
|
||||||
Owns(&corev1.ConfigMap{}).
|
Owns(&corev1.ConfigMap{}).
|
||||||
Watches(secretResource, jenkinsHandler).
|
Watches(secretResource, jenkinsHandler).
|
||||||
Watches(configMapResource, jenkinsHandler).
|
Watches(configMapResource, jenkinsHandler).
|
||||||
Watches(&source.Kind{Type: &v1alpha2.Jenkins{}}, &decorator).
|
Watches(&v1alpha2.Jenkins{}, &decorator).
|
||||||
Complete(r)
|
Complete(r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue