Skip to content

Commit c8cb90e

Browse files
authored
Merge pull request #148 from kndpio/bugfix/kndp-service-account-full-permissions
removed aggregation from kndp SA
2 parents 3633e29 + 99b1a1a commit c8cb90e

File tree

1 file changed

+6
-27
lines changed

1 file changed

+6
-27
lines changed

internal/engine/engine.go

+6-27
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ const (
4848
ReleaseName = "kndp-crossplane"
4949
Version = "1.15.2"
5050
kindClusterRole = "ClusterRole"
51-
clusterRoleName = "crossplane"
5251
providerConfigName = "kndp-kubernetes-provider-config"
5352
helmProviderConfigName = "kndp-helm-provider-config"
5453
aggregateToAdmin = "rbac.crossplane.io/aggregate-to-admin"
@@ -184,13 +183,11 @@ func SetupPrivilegedKubernetesProvider(ctx context.Context, configClient *rest.C
184183
ObjectMeta: metav1.ObjectMeta{
185184
Name: pcn,
186185
},
187-
AggregationRule: &rbacv1.AggregationRule{
188-
ClusterRoleSelectors: []metav1.LabelSelector{
189-
{
190-
MatchLabels: map[string]string{
191-
aggregateToAdmin: trueVal,
192-
},
193-
},
186+
Rules: []rbacv1.PolicyRule{
187+
{
188+
APIGroups: []string{"*", ""},
189+
Verbs: []string{"*"},
190+
Resources: []string{"*"},
194191
},
195192
},
196193
}
@@ -213,31 +210,13 @@ func SetupPrivilegedKubernetesProvider(ctx context.Context, configClient *rest.C
213210
},
214211
}
215212

216-
crbc := &rbacv1.ClusterRoleBinding{
217-
ObjectMeta: metav1.ObjectMeta{
218-
Name: pcn + "-" + clusterRoleName,
219-
},
220-
Subjects: []rbacv1.Subject{
221-
{
222-
Kind: rbacv1.ServiceAccountKind,
223-
Name: sa.Name,
224-
Namespace: namespace.Namespace,
225-
},
226-
},
227-
RoleRef: rbacv1.RoleRef{
228-
APIGroup: rbacv1.GroupName,
229-
Kind: kindClusterRole,
230-
Name: clusterRoleName,
231-
},
232-
}
233-
234213
scheme := runtime.NewScheme()
235214
rbacv1.AddToScheme(scheme)
236215
corev1.AddToScheme(scheme)
237216
extv1.AddToScheme(scheme)
238217
log.SetLogger(zap.New(zap.WriteTo(io.Discard)))
239218
ctrl, _ := client.New(configClient, client.Options{Scheme: scheme})
240-
for _, res := range []client.Object{sa, saSec, cr, crb, crbc} {
219+
for _, res := range []client.Object{sa, saSec, cr, crb} {
241220
_, err := controllerutil.CreateOrUpdate(ctx, ctrl, res, func() error {
242221
return nil
243222
})

0 commit comments

Comments
 (0)