Merge pull request #143 from jkhelil/support_v1beta1

fix rbac for shipwright-operator serviceaccount
shipwright-io · Sep 25, 2023 · 6c71665 · 6c71665
2 parents f244a06 + efbe283
commit 6c71665
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -14,10 +14,10 @@ $ kubectl apply -f https://operatorhub.io/install/shipwright-operator.yaml
 ```
 
 ## OLM Dependencies
-When installed via OLM using the provided SHipwright Operator Bundle, the Shipwright operator has two dependencies to:
-- The Tekton operator needed by the Shipright Build Controller
-- The Cert-Manager operator needed in case you delegate to the Shipwright operator the ssl certificates management of the Shipwright Conversion webhook
-The two operators are then installed automatically by OLM.
+When installed via OLM using the provided Shipwright Operator Bundle, the Shipwright operator will ask OLM to deploy the following operators:
+- The [Tekton operator](https://tekton.dev/docs/operator/) to deploy and manage Tekton Pipelines.
+- The [Cert-Manager operator](https://cert-manager.io/docs/installation/operator-lifecycle-manager/) to provision certificates for admission/conversion webhooks.
+For this to work, the Shipwright operator must be included in a catalog that includes these other operators.
 
 ## Usage
 

diff --git a/bundle/manifests/shipwright-operator.clusterserviceversion.yaml b/bundle/manifests/shipwright-operator.clusterserviceversion.yaml
@@ -584,7 +584,7 @@ spec:
         - apiGroups:
           - ""
           resourceNames:
-          - shipwright-build-controller
+          - shipwright-build-webhook
           resources:
           - services
           verbs:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -206,7 +206,7 @@ rules:
 - apiGroups:
   - ""
   resourceNames:
-  - shipwright-build-controller
+  - shipwright-build-webhook
   resources:
   - services
   verbs:

diff --git a/controllers/shipwrightbuild_rbac.go b/controllers/shipwrightbuild_rbac.go
@@ -40,6 +40,6 @@ package controllers
 // +kubebuilder:rbac:groups=cert-manager.io,resources=certificates,verbs=get;list;watch;create
 // +kubebuilder:rbac:groups=cert-manager.io,resources=certificates,resourceNames=shipwright-build-webhook-cert,verbs=update;patch;delete
 // +kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create
-// +kubebuilder:rbac:groups=core,resources=services,resourceNames=shipwright-build-controller,verbs=update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=services,resourceNames=shipwright-build-webhook,verbs=update;patch;delete
 // +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create
 // +kubebuilder:rbac:groups=core,resources=secrets,resourceNames=shipwright-build-webhook-cert,verbs=update;patch;delete