feat(rbac): update existing rbac #28
Open
+383
−18
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merging this branch will not change overall coverage
Coverage by fileChanged files (no unit tests)
Please note that the "Total", "Covered", and "Missed" counts above refer to code statements instead of lines of code. The value in brackets refers to the test coverage of that file in the old version of the code. Changed unit test files
|
abhijith-darshan
approved these changes
Jan 16, 2026
IvoGoman
reviewed
Jan 16, 2026
Comment on lines
+53
to
+103
| // ClusterRoleBinding already exists - get it and compare | ||
| r.Info("ClusterRoleBinding already exists, comparing with desired state", "ClusterRoleBinding", clusterRoleBinding.Name, "shoot", shootName) | ||
|
|
||
| existingCRB := &rbacv1.ClusterRoleBinding{} | ||
| if err := shootClient.Get(ctx, client.ObjectKey{Name: clusterRoleBinding.Name}, existingCRB); err != nil { | ||
| r.Error(err, "failed to get existing ClusterRoleBinding", "ClusterRoleBinding", clusterRoleBinding.Name) | ||
| return | ||
| } | ||
|
|
||
| // Compare RoleRef and Subjects | ||
| needsRecreate := false | ||
|
|
||
| // Compare RoleRef | ||
| if existingCRB.RoleRef != clusterRoleBinding.RoleRef { | ||
| r.Info("RoleRef differs, will recreate", | ||
| "existing", fmt.Sprintf("%s/%s", existingCRB.RoleRef.Kind, existingCRB.RoleRef.Name), | ||
| "desired", fmt.Sprintf("%s/%s", clusterRoleBinding.RoleRef.Kind, clusterRoleBinding.RoleRef.Name)) | ||
| needsRecreate = true | ||
| } | ||
|
|
||
| // Compare Subjects | ||
| // Note: This comparison assumes subjects are in the same order. If order differs, this will trigger a recreate. | ||
| if !needsRecreate && !cmp.Equal(existingCRB.Subjects, clusterRoleBinding.Subjects) { | ||
| r.Info("Subjects differ, will recreate", | ||
| "existing", existingCRB.Subjects, | ||
| "desired", clusterRoleBinding.Subjects) | ||
| needsRecreate = true | ||
| } | ||
|
|
||
| if needsRecreate { | ||
| r.Info("Deleting existing ClusterRoleBinding", "ClusterRoleBinding", clusterRoleBinding.Name, "shoot", shootName) | ||
| if err := shootClient.Delete(ctx, existingCRB); err != nil { | ||
| r.Error(err, "failed to delete existing ClusterRoleBinding", "ClusterRoleBinding", clusterRoleBinding.Name) | ||
| r.emitEvent(r.CareInstruction, corev1.EventTypeWarning, "RBACRecreationFailed", | ||
| fmt.Sprintf("Failed to recreate ClusterRoleBinding %s for shoot %s/%s: %v", clusterRoleBinding.Name, r.CareInstruction.Namespace, shootName, err)) | ||
| return | ||
| } | ||
|
|
||
| r.Info("Creating new ClusterRoleBinding with correct configuration", "ClusterRoleBinding", clusterRoleBinding.Name, "shoot", shootName) | ||
| if err := shootClient.Create(ctx, clusterRoleBinding); err != nil { | ||
| r.Error(err, "failed to recreate ClusterRoleBinding", "ClusterRoleBinding", clusterRoleBinding.Name) | ||
| r.emitEvent(r.CareInstruction, corev1.EventTypeWarning, "RBACRecreationFailed", | ||
| fmt.Sprintf("Failed to recreate ClusterRoleBinding %s for shoot %s/%s: %v", clusterRoleBinding.Name, r.CareInstruction.Namespace, shootName, err)) | ||
| return | ||
| } | ||
|
|
||
| r.Info("Successfully recreated ClusterRoleBinding", "ClusterRoleBinding", clusterRoleBinding.Name, "shoot", shootName) | ||
| r.emitEvent(r.CareInstruction, corev1.EventTypeNormal, "RBACUpdated", | ||
| fmt.Sprintf("Updated ClusterRoleBinding %s for shoot %s/%s", clusterRoleBinding.Name, r.CareInstruction.Namespace, shootName)) | ||
| } else { | ||
| r.Info("ClusterRoleBinding for Greenhouse ServiceAccount already exists", "ClusterRoleBinding", clusterRoleBinding.Name) | ||
| r.Info("ClusterRoleBinding matches desired state", "ClusterRoleBinding", clusterRoleBinding.Name, "shoot", shootName) |
Contributor
There was a problem hiding this comment.
Could we use controller-runtime's controllerutil.CreateOrUpdate here?
| } | ||
|
|
||
| // Compare Subjects | ||
| // Note: This comparison assumes subjects are in the same order. If order differs, this will trigger a recreate. |
Contributor
There was a problem hiding this comment.
Tip
sort subjects and pass to go-cmp to avoid un-necessary reconciliation
opts := []cmp.Option{
cmpopts.SortSlices(func(a, b []rbacv1.Subjects) bool {
return a.Name < b.Name
}),
}
cmp.Equal(existingCRB.Subjects, clusterRoleBinding.Subjects, opts...)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This updates an existing ClusterRolebinding for Greenhouse on the shoot. Where before we ignore and just checked for existence not for divergence.