Skip to content

Commit 9c4a309

Browse files
yevgeny-shnaidmank8s-ci-robot
authored andcommitted
Hiding the buildsign porting layer initialization
buildsign/pod is a porting layer, and as such we would like to minimize itsexposure to the outer code. This PR make buildsign manager initialize the maker, signer and buildisngpodmanager interfaces inside its own init function, which will remove the exposure to the porting layer from main
1 parent 0ad7b38 commit 9c4a309

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

internal/buildsign/pod/manager.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
v1 "k8s.io/api/core/v1"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
10+
"k8s.io/apimachinery/pkg/runtime"
1011
"sigs.k8s.io/controller-runtime/pkg/client"
1112
"sigs.k8s.io/controller-runtime/pkg/log"
1213

@@ -24,7 +25,10 @@ type podManager struct {
2425
buildSignPodManager BuildSignPodManager
2526
}
2627

27-
func NewManager(client client.Client, maker Maker, signer Signer, buildSignPodManager BuildSignPodManager) buildsign.Manager {
28+
func NewManager(client client.Client, helper buildsign.Helper, scheme *runtime.Scheme) buildsign.Manager {
29+
buildSignPodManager := NewBuildSignPodManager(client)
30+
maker := NewMaker(client, helper, buildSignPodManager, scheme)
31+
signer := NewSigner(client, scheme, buildSignPodManager)
2832
return &podManager{
2933
client: client,
3034
maker: maker,

internal/buildsign/pod/manager_test.go

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
1414
"github.com/kubernetes-sigs/kernel-module-management/internal/api"
15-
buildsign "github.com/kubernetes-sigs/kernel-module-management/internal/buildsign"
1615
"github.com/kubernetes-sigs/kernel-module-management/internal/client"
1716
"github.com/kubernetes-sigs/kernel-module-management/internal/kernel"
1817
)
@@ -24,7 +23,7 @@ var _ = Describe("GetStatus", func() {
2423
mockMaker *MockMaker
2524
mockSigner *MockSigner
2625
mockBuildSignPodManager *MockBuildSignPodManager
27-
mgr buildsign.Manager
26+
mgr *podManager
2827
)
2928
const (
3029
mbscName = "some-name"
@@ -39,7 +38,12 @@ var _ = Describe("GetStatus", func() {
3938
mockMaker = NewMockMaker(ctrl)
4039
mockSigner = NewMockSigner(ctrl)
4140
mockBuildSignPodManager = NewMockBuildSignPodManager(ctrl)
42-
mgr = NewManager(clnt, mockMaker, mockSigner, mockBuildSignPodManager)
41+
mgr = &podManager{
42+
client: clnt,
43+
maker: mockMaker,
44+
signer: mockSigner,
45+
buildSignPodManager: mockBuildSignPodManager,
46+
}
4347
})
4448

4549
ctx := context.Background()
@@ -105,7 +109,7 @@ var _ = Describe("Sync", func() {
105109
mockMaker *MockMaker
106110
mockSigner *MockSigner
107111
mockBuildSignPodManager *MockBuildSignPodManager
108-
mgr buildsign.Manager
112+
mgr *podManager
109113
)
110114
const (
111115
mbscName = "some-name"
@@ -120,7 +124,12 @@ var _ = Describe("Sync", func() {
120124
mockMaker = NewMockMaker(ctrl)
121125
mockSigner = NewMockSigner(ctrl)
122126
mockBuildSignPodManager = NewMockBuildSignPodManager(ctrl)
123-
mgr = NewManager(clnt, mockMaker, mockSigner, mockBuildSignPodManager)
127+
mgr = &podManager{
128+
client: clnt,
129+
maker: mockMaker,
130+
signer: mockSigner,
131+
buildSignPodManager: mockBuildSignPodManager,
132+
}
124133
})
125134

126135
ctx := context.Background()
@@ -241,7 +250,7 @@ var _ = Describe("GarbageCollect", func() {
241250
mockMaker *MockMaker
242251
mockSigner *MockSigner
243252
mockBuildSignPodManager *MockBuildSignPodManager
244-
mgr buildsign.Manager
253+
mgr *podManager
245254
)
246255
const (
247256
mbscName = "some-name"
@@ -256,7 +265,12 @@ var _ = Describe("GarbageCollect", func() {
256265
mockMaker = NewMockMaker(ctrl)
257266
mockSigner = NewMockSigner(ctrl)
258267
mockBuildSignPodManager = NewMockBuildSignPodManager(ctrl)
259-
mgr = NewManager(clnt, mockMaker, mockSigner, mockBuildSignPodManager)
268+
mgr = &podManager{
269+
client: clnt,
270+
maker: mockMaker,
271+
signer: mockSigner,
272+
buildSignPodManager: mockBuildSignPodManager,
273+
}
260274
})
261275

262276
ctx := context.Background()

0 commit comments

Comments
 (0)