Merge pull request #3935 from Ankitasw/add-controller-id-rbac

k8s-ci-robot · web-flow · commit acc446dd37df · 2022-12-21T23:25:25.000-08:00
Add back RBAC for controller identities
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -143,6 +143,7 @@ rules:
   resources:
   - awsclustercontrolleridentities
   verbs:
+  - create
   - get
   - list
   - watch
diff --git a/controllers/awscluster_controller.go b/controllers/awscluster_controller.go
@@ -127,7 +127,7 @@ func (r *AWSClusterReconciler) getSecurityGroupService(scope scope.ClusterScope)
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsclusters/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=clusters;clusters/status,verbs=get;list;watch
 // +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsclusterroleidentities;awsclusterstaticidentities,verbs=get;list;watch
-// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsclustercontrolleridentities,verbs=get;list;watch
+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsclustercontrolleridentities,verbs=get;list;watch;create
 
 func (r *AWSClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
 	log := logger.FromContext(ctx)
diff --git a/exp/controlleridentitycreator/awscontrolleridentity_controller.go b/exp/controlleridentitycreator/awscontrolleridentity_controller.go
@@ -48,7 +48,7 @@ type AWSControllerIdentityReconciler struct {
 	WatchFilterValue string
 }
 
-// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsclustercontrolleridentities,verbs=get;list;watch
+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsclustercontrolleridentities,verbs=get;list;watch;create
 
 func (r *AWSControllerIdentityReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := logger.FromContext(ctx)
diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 // Package logger
-//nolint: logrlint
 package logger
 
 import (

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ type AWSControllerIdentityReconciler struct {`
`48`	`48`	`WatchFilterValue string`
`49`	`49`	`}`
`50`	`50`
`51`		`-// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsclustercontrolleridentities,verbs=get;list;watch`
	`51`	`+// +kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=awsclustercontrolleridentities,verbs=get;list;watch;create`
`52`	`52`
`53`	`53`	`func (r *AWSControllerIdentityReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {`
`54`	`54`	`log := logger.FromContext(ctx)`