Skip to content

Set owner reference for image-builder rolebindings #1590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkwon17 merged 2 commits into from
Feb 13, 2026
Merged

Set owner reference for image-builder rolebindings #1590

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c82fec7
Set owner reference for image-builder rolebindings
dkwon17 Feb 11, 2026
d685079
Apply suggestion
dkwon17 Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions controllers/backupcronjob/backupcronjob_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
Expand Down Expand Up @@ -64,6 +65,7 @@ var _ = Describe("BackupCronJobReconciler", func() {
Expect(dwv2.AddToScheme(scheme)).To(Succeed())
Expect(corev1.AddToScheme(scheme)).To(Succeed())
Expect(batchv1.AddToScheme(scheme)).To(Succeed())
Expect(rbacv1.AddToScheme(scheme)).To(Succeed())
fakeClient = fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(&controllerv1alpha1.DevWorkspaceOperatorConfig{}).Build()
log = zap.New(zap.UseDevMode(true)).WithName("BackupCronJobReconcilerTest")

Expand Down Expand Up @@ -577,6 +579,29 @@ var _ = Describe("BackupCronJobReconciler", func() {
err = reconciler.ensureJobRunnerRBAC(ctx, dw)
Expect(err).ToNot(HaveOccurred())
})

It("creates RoleBinding with OwnerReference on OpenShift", func() {
infrastructure.InitializeForTesting(infrastructure.OpenShiftv4)

dw := createDevWorkspace("dw-rbac-os", "ns-rbac-os", false, metav1.NewTime(time.Now().Add(-10*time.Minute)))
dw.Status.DevWorkspaceId = "id-rbac-os"
Expect(fakeClient.Create(ctx, dw)).To(Succeed())

err := reconciler.ensureJobRunnerRBAC(ctx, dw)
Expect(err).ToNot(HaveOccurred())

// Check RoleBinding
rb := &rbacv1.RoleBinding{}
err = fakeClient.Get(ctx, types.NamespacedName{
Name: "devworkspace-image-builder-id-rbac-os",
Namespace: dw.Namespace,
}, rb)
Expect(err).ToNot(HaveOccurred())

Expect(rb.OwnerReferences).To(HaveLen(1))
Expect(rb.OwnerReferences[0].Name).To(Equal(dw.Name))
Expect(rb.OwnerReferences[0].Kind).To(Equal("DevWorkspace"))
})
})

Context("handleBackupJobStatus", func() {
Expand Down
4 changes: 4 additions & 0 deletions controllers/backupcronjob/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ func (r *BackupCronJobReconciler) ensureImagePushRoleBinding(ctx context.Context
},
}

if err := controllerutil.SetControllerReference(workspace, roleBinding, r.Scheme); err != nil {
return fmt.Errorf("setting controller reference: %w", err)
Copy link
Copy Markdown
Member

@rohanKanojia rohanKanojia Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit, it might be helpful to include the RoleBinding name/namespace in the wrapped error message.

Suggested change
if err := controllerutil.SetControllerReference(workspace, roleBinding, r.Scheme); err != nil {
return fmt.Errorf("setting controller reference: %w", err)
if err := controllerutil.SetControllerReference(workspace, roleBinding, r.Scheme); err != nil {
return fmt.Errorf(
"failed to set controller reference for RoleBinding %s/%s: %w",
roleBinding.Namespace,
roleBinding.Name,
err,
)

Copy link
Copy Markdown
Collaborator Author

@dkwon17 dkwon17 Feb 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, I applied the change in my latest commit

}

_, err := sync.SyncObjectWithCluster(roleBinding, clusterAPI)
if err != nil {
if _, ok := err.(*sync.NotInSyncError); !ok {
Expand Down
Loading