Skip to content

Commit c22ac4f

Browse files
Merge branch 'projectcalico:master' into master
2 parents cca15e1 + fc468e5 commit c22ac4f

File tree

61 files changed

+1239
-1783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1239
-1783
lines changed

charts/tigera-operator/templates/tigera-operator/02-role-tigera-operator.yaml

+16-8
Original file line numberDiff line numberDiff line change
@@ -151,23 +151,30 @@ rules:
151151
- apiGroups:
152152
- operator.tigera.io
153153
resources:
154+
# Note: any resources used by the operator within an OwnerReference for resources
155+
# it creates requires permissions to <resource>/finalizers.
156+
- apiservers
154157
- apiservers/finalizers
158+
- apiservers/status
155159
- gatewayapis
156160
- gatewayapis/finalizers
161+
- gatewayapis/status
162+
- goldmanes
163+
- goldmanes/finalizers
164+
- goldmanes/status
165+
- imagesets
157166
- installations
158-
- installations/status
159167
- installations/finalizers
168+
- installations/status
169+
- managementclusterconnections
170+
- managementclusterconnections/finalizers
171+
- managementclusterconnections/status
160172
- tigerastatuses
161173
- tigerastatuses/status
162174
- tigerastatuses/finalizers
163-
- apiservers
164-
- apiservers/status
165-
- imagesets
166175
- whiskers
167-
- goldmanes
168-
- managementclusterconnections
169-
- managementclusterconnections/finalizers
170-
- managementclusterconnections/status
176+
- whiskers/finalizers
177+
- whiskers/status
171178
verbs:
172179
- get
173180
- list
@@ -387,6 +394,7 @@ rules:
387394
- update
388395
- list
389396
- watch
397+
- delete
390398
{{- else }}
391399
# Add the appropriate pod security policy permissions
392400
- apiGroups:

cni-plugin/pkg/dataplane/grpc/proto/cnibackend.pb.go

+68-118
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)