Skip to content

Commit e44c73c

Browse files
Copilotpl4nty
andauthored
Fix operator RBAC for event recording
Agent-Logs-Url: https://github.com/pl4nty/toolhive/sessions/91c560a3-ef9f-42db-82be-d6fceeadeff7 Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: pl4nty <21111317+pl4nty@users.noreply.github.com>
1 parent 8c84c05 commit e44c73c

9 files changed

Lines changed: 15 additions & 15 deletions

File tree

cmd/thv-operator/controllers/embeddingserver_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const (
6565
//+kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;create;update;patch;delete
6666
//+kubebuilder:rbac:groups="",resources=persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete
6767
//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
68-
//+kubebuilder:rbac:groups="",resources=events,verbs=create;patch
68+
//+kubebuilder:rbac:groups=events.k8s.io,resources=events,verbs=create;patch
6969

7070
// Reconcile is part of the main kubernetes reconciliation loop which aims to
7171
// move the current state of the cluster closer to the desired state.

cmd/thv-operator/controllers/mcpregistry_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func NewMCPRegistryReconciler(
7070
// +kubebuilder:rbac:groups=toolhive.stacklok.dev,resources=mcpregistries/finalizers,verbs=update
7171
// +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;watch;create;update;patch;delete
7272
// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;patch;delete
73-
// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
73+
// +kubebuilder:rbac:groups=events.k8s.io,resources=events,verbs=create;patch
7474
//
7575
// For creating registry-api deployment and service
7676
// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete

cmd/thv-operator/controllers/mcpremoteproxy_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ type MCPRemoteProxyReconciler struct {
5959
// +kubebuilder:rbac:groups="",resources=services,verbs=create;delete;get;list;patch;update;watch
6060
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=roles,verbs=create;delete;get;list;patch;update;watch
6161
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=rolebindings,verbs=create;delete;get;list;patch;update;watch
62-
// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
62+
// +kubebuilder:rbac:groups=events.k8s.io,resources=events,verbs=create;patch
6363
// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
6464
// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=create;delete;get;list;patch;update;watch
6565
// +kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=create;delete;get;list;patch;update;watch

cmd/thv-operator/controllers/mcpserver_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func (r *MCPServerReconciler) detectPlatform(ctx context.Context) (kubernetes.Pl
157157
// +kubebuilder:rbac:groups="",resources=services,verbs=create;delete;get;list;patch;update;watch
158158
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=roles,verbs=create;delete;get;list;patch;update;watch
159159
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=rolebindings,verbs=create;delete;get;list;patch;update;watch
160-
// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
160+
// +kubebuilder:rbac:groups=events.k8s.io,resources=events,verbs=create;patch
161161
// +kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch
162162
// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
163163
// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=create;delete;get;list;patch;update;watch

cmd/thv-operator/controllers/virtualmcpserver_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ type VirtualMCPServerReconciler struct {
125125
// +kubebuilder:rbac:groups="",resources=services,verbs=create;delete;get;list;patch;update;watch
126126
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=roles,verbs=create;delete;get;list;patch;update;watch
127127
// +kubebuilder:rbac:groups="rbac.authorization.k8s.io",resources=rolebindings,verbs=create;delete;get;list;patch;update;watch
128-
// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
128+
// +kubebuilder:rbac:groups=events.k8s.io,resources=events,verbs=create;patch
129129
// +kubebuilder:rbac:groups="",resources=secrets,verbs=create;get;list;watch
130130
// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=create;delete;get;list;patch;update;watch
131131
// +kubebuilder:rbac:groups="",resources=serviceaccounts,verbs=create;delete;get;list;patch;update;watch

deploy/charts/operator/templates/clusterrole/role.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ rules:
2020
- patch
2121
- update
2222
- watch
23-
- apiGroups:
24-
- ""
25-
resources:
26-
- events
27-
verbs:
28-
- create
29-
- patch
3023
- apiGroups:
3124
- ""
3225
resources:
@@ -73,6 +66,13 @@ rules:
7366
- patch
7467
- update
7568
- watch
69+
- apiGroups:
70+
- events.k8s.io
71+
resources:
72+
- events
73+
verbs:
74+
- create
75+
- patch
7676
- apiGroups:
7777
- gateway.networking.k8s.io
7878
resources:

deploy/charts/operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ operator:
194194
- patch
195195
- delete
196196
- apiGroups:
197-
- ""
197+
- events.k8s.io
198198
resources:
199199
- events
200200
verbs:

test/e2e/chainsaw/operator/multi-tenancy/setup/assert-rbac-clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rules:
2121
- update
2222
- watch
2323
- apiGroups:
24-
- ""
24+
- events.k8s.io
2525
resources:
2626
- events
2727
verbs:

test/e2e/chainsaw/operator/single-tenancy/setup/assert-rbac-clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rules:
2121
- update
2222
- watch
2323
- apiGroups:
24-
- ""
24+
- events.k8s.io
2525
resources:
2626
- events
2727
verbs:

0 commit comments

Comments
 (0)