Skip to content

KMM Module should be Owner-Controller of MIC #1063

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
k8s-ci-robot merged 1 commit into from
Mar 30, 2025
Merged

KMM Module should be Owner-Controller of MIC #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion internal/mic/mic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (mici *micImpl) CreateOrPatch(ctx context.Context, name, ns string, images
ImageRepoSecret: imageRepoSecret,
}

return controllerutil.SetOwnerReference(owner, mic, mici.scheme)
return controllerutil.SetControllerReference(owner, mic, mici.scheme)
})
if err != nil {
return fmt.Errorf("failed to create or patch %s/%s: %v", ns, name, err)
Expand Down
7 changes: 4 additions & 3 deletions internal/mic/mic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package mic

import (
"context"
"fmt"

kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
v1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
Expand Down Expand Up @@ -42,13 +43,13 @@ var _ = Describe("ApplyMIC", func() {

It("should fail if we failed to create or patch", func() {

mockClient.EXPECT().Get(ctx, gomock.Any(), gomock.Any()).Return(nil)
mockClient.EXPECT().Get(ctx, gomock.Any(), gomock.Any()).Return(fmt.Errorf("some error"))

err := micAPI.CreateOrPatch(ctx, micName, micNamespace, []v1beta1.ModuleImageSpec{}, nil, nil)
err := micAPI.CreateOrPatch(ctx, micName, micNamespace, []v1beta1.ModuleImageSpec{}, nil, &kmmv1beta1.Module{})

Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("failed to create or patch"))
Expect(err.Error()).To(ContainSubstring("cannot call SetOwnerReference"))
Expect(err.Error()).To(ContainSubstring("some error"))
})

It("should create the MIC if it doesn't exist", func() {
Expand Down
Loading