Skip to content
This repository was archived by the owner on Dec 11, 2023. It is now read-only.

Commit cf1cb37

Browse files
author
Pablo Mercado
authored
Merge pull request #71 from odacremolbap/fix/conflict-kn-addressable-resolvers
Avoid conflict with kn addressable resolver
2 parents 1be7221 + f8024ab commit cf1cb37

File tree

2 files changed

+27
-6
lines changed

2 files changed

+27
-6
lines changed

config/200-kn-clusterrole-addressable-resolvers.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
apiVersion: rbac.authorization.k8s.io/v1
1717
kind: ClusterRole
1818
metadata:
19-
name: addressable-resolver
19+
# There might be an addressable-resolver ClusterRole if Knative Eventing is installed.
20+
# This would be a duplicate for TriggerMesh's brokers that would add support for scenarios
21+
# where Knative Eventing is not installed but Knative Serving is.
22+
name: addressable-resolver-triggermesh
2023
labels:
2124
eventing.knative.dev/release: devel
2225
app.kubernetes.io/version: devel
@@ -32,7 +35,7 @@ rules: [] # Rules are automatically filled in by the controller manager.
3235
kind: ClusterRole
3336
apiVersion: rbac.authorization.k8s.io/v1
3437
metadata:
35-
name: service-addressable-resolver
38+
name: service-addressable-resolver-triggermesh
3639
labels:
3740
eventing.knative.dev/release: devel
3841
duck.knative.dev/addressable: "true"
@@ -54,7 +57,7 @@ rules:
5457
kind: ClusterRole
5558
apiVersion: rbac.authorization.k8s.io/v1
5659
metadata:
57-
name: serving-addressable-resolver
60+
name: serving-addressable-resolver-triggermesh
5861
labels:
5962
eventing.knative.dev/release: devel
6063
duck.knative.dev/addressable: "true"
@@ -79,7 +82,7 @@ rules:
7982
kind: ClusterRole
8083
apiVersion: rbac.authorization.k8s.io/v1
8184
metadata:
82-
name: channel-addressable-resolver
85+
name: channel-addressable-resolver-triggermesh
8386
labels:
8487
eventing.knative.dev/release: devel
8588
duck.knative.dev/addressable: "true"
@@ -108,7 +111,7 @@ rules:
108111
kind: ClusterRole
109112
apiVersion: rbac.authorization.k8s.io/v1
110113
metadata:
111-
name: broker-addressable-resolver
114+
name: broker-addressable-resolver-triggermesh
112115
labels:
113116
eventing.knative.dev/release: devel
114117
duck.knative.dev/addressable: "true"
@@ -131,7 +134,7 @@ rules:
131134
kind: ClusterRole
132135
apiVersion: rbac.authorization.k8s.io/v1
133136
metadata:
134-
name: flows-addressable-resolver
137+
name: flows-addressable-resolver-triggermesh
135138
labels:
136139
eventing.knative.dev/release: devel
137140
duck.knative.dev/addressable: "true"

config/202-clusterrolebindings.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,24 @@ metadata:
4444
labels:
4545
app.kubernetes.io/part-of: triggermesh
4646
subjects:
47+
- kind: ServiceAccount
48+
name: triggermesh-core-controller
49+
namespace: triggermesh
50+
roleRef:
51+
apiGroup: rbac.authorization.k8s.io
52+
kind: ClusterRole
53+
name: addressable-resolver-triggermesh
54+
55+
---
56+
57+
# If Knative Eventing is installed, use also the addressable-resolver.
58+
apiVersion: rbac.authorization.k8s.io/v1
59+
kind: ClusterRoleBinding
60+
metadata:
61+
name: triggermesh-core-controller-resolver-knative
62+
labels:
63+
app.kubernetes.io/part-of: triggermesh
64+
subjects:
4765
- kind: ServiceAccount
4866
name: triggermesh-core-controller
4967
namespace: triggermesh

0 commit comments

Comments
 (0)