@@ -48,7 +48,6 @@ const (
48
48
ReleaseName = "kndp-crossplane"
49
49
Version = "1.15.2"
50
50
kindClusterRole = "ClusterRole"
51
- clusterRoleName = "crossplane"
52
51
providerConfigName = "kndp-kubernetes-provider-config"
53
52
helmProviderConfigName = "kndp-helm-provider-config"
54
53
aggregateToAdmin = "rbac.crossplane.io/aggregate-to-admin"
@@ -184,13 +183,11 @@ func SetupPrivilegedKubernetesProvider(ctx context.Context, configClient *rest.C
184
183
ObjectMeta : metav1.ObjectMeta {
185
184
Name : pcn ,
186
185
},
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 {"*" },
194
191
},
195
192
},
196
193
}
@@ -213,31 +210,13 @@ func SetupPrivilegedKubernetesProvider(ctx context.Context, configClient *rest.C
213
210
},
214
211
}
215
212
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
-
234
213
scheme := runtime .NewScheme ()
235
214
rbacv1 .AddToScheme (scheme )
236
215
corev1 .AddToScheme (scheme )
237
216
extv1 .AddToScheme (scheme )
238
217
log .SetLogger (zap .New (zap .WriteTo (io .Discard )))
239
218
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 } {
241
220
_ , err := controllerutil .CreateOrUpdate (ctx , ctrl , res , func () error {
242
221
return nil
243
222
})
0 commit comments