public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix logging about watches resources

This commit is contained in:
Tomasz Sęk 2019-06-23 10:39:50 +02:00
parent 0b03b85cf0
commit 037c1fa025
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/apis/jenkins/v1alpha2/register.go
View File

@ -1,5 +1,3 @@
// NOTE: Boilerplate only. Ignore this file.
// Package v1alpha2 contains API Schema definitions for the jenkins.io v1alpha2 API group // Package v1alpha2 contains API Schema definitions for the jenkins.io v1alpha2 API group
// +k8s:deepcopy-gen=package,register // +k8s:deepcopy-gen=package,register
// +groupName=jenkins.io // +groupName=jenkins.io
@ -26,6 +24,16 @@ var (
// GetObjectKind returns Jenkins object kind // GetObjectKind returns Jenkins object kind
func (in *Jenkins) GetObjectKind() schema.ObjectKind { return in } func (in *Jenkins) GetObjectKind() schema.ObjectKind { return in }
func (in *Jenkins) SetGroupVersionKind(kind schema.GroupVersionKind) {}
func (in *Jenkins) GroupVersionKind() schema.GroupVersionKind {
return schema.GroupVersionKind{
Group: SchemeGroupVersion.Group,
Version: SchemeGroupVersion.Version,
Kind: Kind,
}
}
func init() { func init() {
SchemeBuilder.Register(&Jenkins{}, &JenkinsList{}) SchemeBuilder.Register(&Jenkins{}, &JenkinsList{})
} }

6
pkg/controller/jenkins/jenkins_controller.go
View File

@ -85,7 +85,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
} }
// Watch for changes to secondary resource Pods and requeue the owner Jenkins // Watch for changes to secondary resource Pods and requeue the owner Jenkins
err = c.Watch(&source.Kind{Type: &corev1.Pod{}}, &handler.EnqueueRequestForOwner{ err = c.Watch(&source.Kind{Type: &corev1.Pod{TypeMeta: metav1.TypeMeta{APIVersion: "core/v1", Kind: "Pod"}}}, &handler.EnqueueRequestForOwner{
IsController: true, IsController: true,
OwnerType: &v1alpha2.Jenkins{}, OwnerType: &v1alpha2.Jenkins{},
}) })
@ -94,12 +94,12 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
} }
jenkinsHandler := &enqueueRequestForJenkins{} jenkinsHandler := &enqueueRequestForJenkins{}
err = c.Watch(&source.Kind{Type: &corev1.Secret{}}, jenkinsHandler) err = c.Watch(&source.Kind{Type: &corev1.Secret{TypeMeta: metav1.TypeMeta{APIVersion: "core/v1", Kind: "Secret"}}}, jenkinsHandler)
if err != nil { if err != nil {
return errors.WithStack(err) return errors.WithStack(err)
} }
err = c.Watch(&source.Kind{Type: &corev1.ConfigMap{}}, jenkinsHandler) err = c.Watch(&source.Kind{Type: &corev1.ConfigMap{TypeMeta: metav1.TypeMeta{APIVersion: "core/v1", Kind: "ConfigMap"}}}, jenkinsHandler)
if err != nil { if err != nil {
return errors.WithStack(err) return errors.WithStack(err)
} }