diff --git a/chart/jenkins-operator/templates/role.yaml b/chart/jenkins-operator/templates/role.yaml index 49ef89cf7..cc15fdd01 100644 --- a/chart/jenkins-operator/templates/role.yaml +++ b/chart/jenkins-operator/templates/role.yaml @@ -72,6 +72,7 @@ rules: resources: - events verbs: + - get - watch - list - create diff --git a/config/all_in_one_v1alpha2.yaml b/config/all_in_one_v1alpha2.yaml index a8f2ef4e0..0a70e35b9 100644 --- a/config/all_in_one_v1alpha2.yaml +++ b/config/all_in_one_v1alpha2.yaml @@ -104,6 +104,7 @@ rules: resources: - events verbs: + - get - watch - list - create diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index c0d31da62..c6364d23b 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -63,6 +63,7 @@ rules: resources: - events verbs: + - get - watch - list - create diff --git a/main.go b/main.go index 0ef69846f..89beb2be5 100644 --- a/main.go +++ b/main.go @@ -81,7 +81,7 @@ func main() { isRunningInCluster, err := resources.IsRunningInCluster() if err != nil { - fatal(errors.Wrap(err, "failed to get watch namespace"), true) + fatal(errors.Wrap(err, "failed to determine if operator is running in cluster"), true) } flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.") @@ -133,7 +133,7 @@ func main() { fatal(errors.Wrap(err, "failed to setup events"), *debug) } - //Setup controller + // setup controller clientSet, err := kubernetes.NewForConfig(cfg) if err != nil { fatal(errors.Wrap(err, "failed to create Kubernetes client set"), *debug) diff --git a/pkg/configuration/base/resources/rbac.go b/pkg/configuration/base/resources/rbac.go index 88a968485..f0024dc8a 100644 --- a/pkg/configuration/base/resources/rbac.go +++ b/pkg/configuration/base/resources/rbac.go @@ -62,7 +62,6 @@ func NewDefaultPolicyRules() []v1.PolicyRule { readOnly := []string{getVerb, listVerb, watchVerb} Default := []string{createVerb, deleteVerb, getVerb, listVerb, patchVerb, updateVerb, watchVerb} create := []string{createVerb} - watch := []string{watchVerb} rules = append(rules, NewPolicyRule(EmptyAPIGroup, "pods/portforward", create)) rules = append(rules, NewPolicyRule(EmptyAPIGroup, "pods", Default)) @@ -70,7 +69,7 @@ func NewDefaultPolicyRules() []v1.PolicyRule { rules = append(rules, NewPolicyRule(EmptyAPIGroup, "configmaps", readOnly)) rules = append(rules, NewPolicyRule(EmptyAPIGroup, "pods/log", readOnly)) rules = append(rules, NewPolicyRule(EmptyAPIGroup, "secrets", readOnly)) - rules = append(rules, NewPolicyRule(EmptyAPIGroup, "events", watch)) + rules = append(rules, NewPolicyRule(EmptyAPIGroup, "events", readOnly)) rules = append(rules, NewOpenShiftPolicyRule(OpenshiftAPIGroup, "imagestreams", readOnly)) rules = append(rules, NewOpenShiftPolicyRule(BuildAPIGroup, "buildconfigs", readOnly))