Skip to content

Commit ff46829

Browse files
committed
Fix verify: regenerate bundle via make bundle with kubebuilder RBAC markers
Remove config/console from kustomize manifests (Console resources are now created at runtime, not by OLM). Add kubebuilder RBAC markers for console.openshift.io and clusterversions so make bundle generates the correct CSV permissions.
1 parent 07d3553 commit ff46829

4 files changed

Lines changed: 31 additions & 17 deletions

File tree

bundle/manifests/cert-manager-operator.clusterserviceversion.yaml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -410,25 +410,9 @@ spec:
410410
- apiGroups:
411411
- config.openshift.io
412412
resources:
413-
- clusterversions
414413
- featuregates
415414
verbs:
416415
- get
417-
- list
418-
- watch
419-
- apiGroups:
420-
- console.openshift.io
421-
resources:
422-
- consolequickstarts
423-
- consoleyamlsamples
424-
verbs:
425-
- create
426-
- delete
427-
- get
428-
- list
429-
- patch
430-
- update
431-
- watch
432416
- apiGroups:
433417
- ""
434418
resources:
@@ -584,6 +568,7 @@ spec:
584568
- config.openshift.io
585569
resources:
586570
- apiservers
571+
- clusterversions
587572
verbs:
588573
- get
589574
- list
@@ -603,6 +588,19 @@ spec:
603588
- patch
604589
- update
605590
- watch
591+
- apiGroups:
592+
- console.openshift.io
593+
resources:
594+
- consolequickstarts
595+
- consoleyamlsamples
596+
verbs:
597+
- create
598+
- delete
599+
- get
600+
- list
601+
- patch
602+
- update
603+
- watch
606604
- apiGroups:
607605
- coordination.k8s.io
608606
resources:

config/manifests/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ resources:
55
- ../default
66
- ../samples
77
- ../scorecard
8-
- ../console
98

109
# [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
1110
# Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.

config/rbac/role.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ rules:
159159
- config.openshift.io
160160
resources:
161161
- apiservers
162+
- clusterversions
162163
verbs:
163164
- get
164165
- list
@@ -178,6 +179,19 @@ rules:
178179
- patch
179180
- update
180181
- watch
182+
- apiGroups:
183+
- console.openshift.io
184+
resources:
185+
- consolequickstarts
186+
- consoleyamlsamples
187+
verbs:
188+
- create
189+
- delete
190+
- get
191+
- list
192+
- patch
193+
- update
194+
- watch
181195
- apiGroups:
182196
- coordination.k8s.io
183197
resources:

pkg/controller/certmanager/console_resources.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ var (
4848
}
4949
)
5050

51+
// +kubebuilder:rbac:groups=config.openshift.io,resources=clusterversions,verbs=get;list;watch
52+
// +kubebuilder:rbac:groups=console.openshift.io,resources=consoleyamlsamples;consolequickstarts,verbs=get;list;watch;create;update;patch;delete
53+
5154
// consoleResourcesController conditionally creates Console resources
5255
// (ConsoleYAMLSample, ConsoleQuickStart) when the Console capability
5356
// is enabled on the cluster.

0 commit comments

Comments
 (0)