Skip to content

Commit c1f73ce

Browse files
mjudeikismjudeikis
committed
reduce verbocity
1 parent c2d508a commit c1f73ce

4 files changed

Lines changed: 23 additions & 35 deletions

File tree

‎backend/controllers/clusterbinding/clusterbinding_controller.go‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,11 @@ func NewClusterBindingReconciler(
9393
}
9494
return &role, nil
9595
},
96-
createClusterRole: func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRole) (*rbacv1.ClusterRole, error) {
97-
if err := client.Create(ctx, binding); err != nil {
98-
return nil, fmt.Errorf("failed to create ClusterRole %q: %w", binding.Name, err)
99-
}
100-
return binding, nil
96+
createClusterRole: func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRole) error {
97+
return client.Create(ctx, binding)
10198
},
102-
updateClusterRole: func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRole) (*rbacv1.ClusterRole, error) {
103-
if err := client.Update(ctx, binding); err != nil {
104-
return nil, fmt.Errorf("failed to update ClusterRole %q: %w", binding.Name, err)
105-
}
106-
return binding, nil
99+
updateClusterRole: func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRole) error {
100+
return client.Update(ctx, binding)
107101
},
108102
getClusterRoleBinding: func(ctx context.Context, cache cache.Cache, name string) (*rbacv1.ClusterRoleBinding, error) {
109103
var binding rbacv1.ClusterRoleBinding
@@ -115,15 +109,12 @@ func NewClusterBindingReconciler(
115109
},
116110
createClusterRoleBinding: func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRoleBinding) (*rbacv1.ClusterRoleBinding, error) {
117111
if err := client.Create(ctx, binding); err != nil {
118-
return nil, fmt.Errorf("failed to create ClusterRoleBinding %q: %w", binding.Name, err)
112+
return nil, err
119113
}
120114
return binding, nil
121115
},
122-
updateClusterRoleBinding: func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRoleBinding) (*rbacv1.ClusterRoleBinding, error) {
123-
if err := client.Update(ctx, binding); err != nil {
124-
return nil, fmt.Errorf("failed to update ClusterRoleBinding %q: %w", binding.Name, err)
125-
}
126-
return binding, nil
116+
updateClusterRoleBinding: func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRoleBinding) error {
117+
return client.Update(ctx, binding)
127118
},
128119
deleteClusterRoleBinding: func(ctx context.Context, client client.Client, name string) error {
129120
binding := &rbacv1.ClusterRoleBinding{
@@ -135,7 +126,7 @@ func NewClusterBindingReconciler(
135126
var ns v1.Namespace
136127
key := types.NamespacedName{Name: name}
137128
if err := cache.Get(ctx, key, &ns); err != nil {
138-
return nil, fmt.Errorf("failed to get Namespace %q: %w", name, err)
129+
return nil, err
139130
}
140131
return &ns, nil
141132
},
@@ -145,11 +136,11 @@ func NewClusterBindingReconciler(
145136
}
146137
return binding, nil
147138
},
148-
updateRoleBinding: func(ctx context.Context, client client.Client, binding *rbacv1.RoleBinding) (*rbacv1.RoleBinding, error) {
139+
updateRoleBinding: func(ctx context.Context, client client.Client, binding *rbacv1.RoleBinding) error {
149140
if err := client.Update(ctx, binding); err != nil {
150-
return nil, fmt.Errorf("failed to update RoleBinding %q in namespace %q: %w", binding.Name, binding.Namespace, err)
141+
return fmt.Errorf("failed to update RoleBinding %q in namespace %q: %w", binding.Name, binding.Namespace, err)
151142
}
152-
return binding, nil
143+
return nil
153144
},
154145
getRoleBinding: func(ctx context.Context, cache cache.Cache, ns, name string) (*rbacv1.RoleBinding, error) {
155146
var binding rbacv1.RoleBinding

‎backend/controllers/clusterbinding/clusterbinding_reconcile.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ type reconciler struct {
4343
listServiceExports func(ctx context.Context, cache cache.Cache, ns string) ([]*kubebindv1alpha2.APIServiceExport, error)
4444
getAPIResourceSchema func(ctx context.Context, cache cache.Cache, name string) (*kubebindv1alpha2.APIResourceSchema, error)
4545
getClusterRole func(ctx context.Context, cache cache.Cache, name string) (*rbacv1.ClusterRole, error)
46-
createClusterRole func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRole) (*rbacv1.ClusterRole, error)
47-
updateClusterRole func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRole) (*rbacv1.ClusterRole, error)
46+
createClusterRole func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRole) error
47+
updateClusterRole func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRole) error
4848

4949
getClusterRoleBinding func(ctx context.Context, cache cache.Cache, name string) (*rbacv1.ClusterRoleBinding, error)
5050
createClusterRoleBinding func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRoleBinding) (*rbacv1.ClusterRoleBinding, error)
51-
updateClusterRoleBinding func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRoleBinding) (*rbacv1.ClusterRoleBinding, error)
51+
updateClusterRoleBinding func(ctx context.Context, client client.Client, binding *rbacv1.ClusterRoleBinding) error
5252
deleteClusterRoleBinding func(ctx context.Context, client client.Client, name string) error
5353

5454
getRoleBinding func(ctx context.Context, cache cache.Cache, ns, name string) (*rbacv1.RoleBinding, error)
5555
createRoleBinding func(ctx context.Context, client client.Client, binding *rbacv1.RoleBinding) (*rbacv1.RoleBinding, error)
56-
updateRoleBinding func(ctx context.Context, client client.Client, binding *rbacv1.RoleBinding) (*rbacv1.RoleBinding, error)
56+
updateRoleBinding func(ctx context.Context, client client.Client, binding *rbacv1.RoleBinding) error
5757

5858
getNamespace func(ctx context.Context, cache cache.Cache, name string) (*corev1.Namespace, error)
5959
}
@@ -172,13 +172,13 @@ func (r *reconciler) ensureRBACClusterRole(ctx context.Context, client client.Cl
172172
}
173173

174174
if role == nil {
175-
if _, err := r.createClusterRole(ctx, client, expected); err != nil {
175+
if err := r.createClusterRole(ctx, client, expected); err != nil {
176176
return fmt.Errorf("failed to create ClusterRole %s: %w", expected.Name, err)
177177
}
178178
} else if !reflect.DeepEqual(role.Rules, expected.Rules) {
179179
role = role.DeepCopy()
180180
role.Rules = expected.Rules
181-
if _, err := r.updateClusterRole(ctx, client, role); err != nil {
181+
if err := r.updateClusterRole(ctx, client, role); err != nil {
182182
return fmt.Errorf("failed to create ClusterRole %s: %w", role.Name, err)
183183
}
184184
}
@@ -239,7 +239,7 @@ func (r *reconciler) ensureRBACClusterRoleBinding(ctx context.Context, client cl
239239
binding = binding.DeepCopy()
240240
binding.Subjects = expected.Subjects
241241
// roleRef is immutable
242-
if _, err := r.updateClusterRoleBinding(ctx, client, binding); err != nil {
242+
if err := r.updateClusterRoleBinding(ctx, client, binding); err != nil {
243243
return fmt.Errorf("failed to create ClusterRoleBinding %s: %w", expected.Namespace, err)
244244
}
245245
}
@@ -280,7 +280,7 @@ func (r *reconciler) ensureRBACRoleBinding(ctx context.Context, client client.Cl
280280
binding = binding.DeepCopy()
281281
binding.Subjects = expected.Subjects
282282
// roleRef is immutable
283-
if _, err := r.updateRoleBinding(ctx, client, binding); err != nil {
283+
if err := r.updateRoleBinding(ctx, client, binding); err != nil {
284284
return fmt.Errorf("failed to create RoleBinding %s: %w", expected.Namespace, err)
285285
}
286286
}

‎backend/controllers/serviceexportrequest/serviceexportrequest_controller.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,8 @@ func NewAPIServiceExportRequestReconciler(
106106
}
107107
return &export, nil
108108
},
109-
createServiceExport: func(ctx context.Context, cl client.Client, resource *kubebindv1alpha2.APIServiceExport) (*kubebindv1alpha2.APIServiceExport, error) {
110-
if err := cl.Create(ctx, resource); err != nil {
111-
return nil, err
112-
}
113-
return resource, nil
109+
createServiceExport: func(ctx context.Context, cl client.Client, resource *kubebindv1alpha2.APIServiceExport) error {
110+
return cl.Create(ctx, resource)
114111
},
115112
createAPIResourceSchema: func(ctx context.Context, cl client.Client, schema *kubebindv1alpha2.APIResourceSchema) (*kubebindv1alpha2.APIResourceSchema, error) {
116113
if err := cl.Create(ctx, schema); err != nil {

‎backend/controllers/serviceexportrequest/serviceexportrequest_reconcile.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type reconciler struct {
4141
getCRD func(ctx context.Context, cache cache.Cache, name string) (*apiextensionsv1.CustomResourceDefinition, error)
4242
getAPIResourceSchema func(ctx context.Context, cache cache.Cache, name string) (*kubebindv1alpha2.APIResourceSchema, error)
4343
getServiceExport func(ctx context.Context, cache cache.Cache, ns, name string) (*kubebindv1alpha2.APIServiceExport, error)
44-
createServiceExport func(ctx context.Context, cl client.Client, resource *kubebindv1alpha2.APIServiceExport) (*kubebindv1alpha2.APIServiceExport, error)
44+
createServiceExport func(ctx context.Context, cl client.Client, resource *kubebindv1alpha2.APIServiceExport) error
4545
createAPIResourceSchema func(ctx context.Context, cl client.Client, schema *kubebindv1alpha2.APIResourceSchema) (*kubebindv1alpha2.APIResourceSchema, error)
4646
deleteServiceExportRequest func(ctx context.Context, cl client.Client, namespace, name string) error
4747
}
@@ -131,7 +131,7 @@ func (r *reconciler) ensureExports(ctx context.Context, cl client.Client, cache
131131
}
132132

133133
logger.V(1).Info("Creating APIServiceExport", "name", export.Name, "namespace", export.Namespace)
134-
if _, err = r.createServiceExport(ctx, cl, export); err != nil {
134+
if err = r.createServiceExport(ctx, cl, export); err != nil {
135135
return err
136136
}
137137
}

0 commit comments

Comments
 (0)