Skip to content

Commit 056fc47

Browse files
ybettank8s-ci-robot
ybettan
authored and
k8s-ci-robot
committed
Removed the PodType consts in the buildsign package.
We can directly use the API's `BuildImage` and `SignImage`. No need to use local consts and do the translation. Signed-off-by: Yoni Bettan <yonibettan@gmail.com>
1 parent 84873c2 commit 056fc47

File tree

13 files changed

+80
-73
lines changed

13 files changed

+80
-73
lines changed

‎internal/build/pod/maker.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (m *maker) MakePodTemplate(
9090
ObjectMeta: metav1.ObjectMeta{
9191
GenerateName: mld.Name + "-build-",
9292
Namespace: mld.Namespace,
93-
Labels: m.buildSignPodManager.PodLabels(mld.Name, mld.KernelNormalizedVersion, pod.PodTypeBuild),
93+
Labels: m.buildSignPodManager.PodLabels(mld.Name, mld.KernelNormalizedVersion, PodTypeBuild),
9494
Annotations: map[string]string{constants.PodHashAnnotation: fmt.Sprintf("%d", podSpecHash)},
9595
Finalizers: []string{constants.GCDelayFinalizer, constants.JobEventFinalizer},
9696
},

‎internal/build/pod/maker_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ var _ = Describe("MakePodTemplate", func() {
240240
return nil
241241
},
242242
),
243-
mockBuildSignPodManager.EXPECT().PodLabels(mld.Name, kernelNormalizedVersion, pod.PodTypeBuild).Return(labels),
243+
mockBuildSignPodManager.EXPECT().PodLabels(mld.Name, kernelNormalizedVersion, PodTypeBuild).Return(labels),
244244
)
245245

246246
actual, err := m.MakePodTemplate(ctx, &mld, mld.Owner, true)
@@ -306,7 +306,7 @@ var _ = Describe("MakePodTemplate", func() {
306306
return nil
307307
},
308308
),
309-
mockBuildSignPodManager.EXPECT().PodLabels(mod.Name, kernelNormalizedVersion, pod.PodTypeBuild).Return(map[string]string{}),
309+
mockBuildSignPodManager.EXPECT().PodLabels(mod.Name, kernelNormalizedVersion, PodTypeBuild).Return(map[string]string{}),
310310
)
311311

312312
actual, err := m.MakePodTemplate(ctx, &mld, mld.Owner, pushImage)
@@ -385,7 +385,7 @@ var _ = Describe("MakePodTemplate", func() {
385385
return nil
386386
},
387387
),
388-
mockBuildSignPodManager.EXPECT().PodLabels(mld.Name, kernelNormalizedVersion, pod.PodTypeBuild).Return(map[string]string{}),
388+
mockBuildSignPodManager.EXPECT().PodLabels(mld.Name, kernelNormalizedVersion, PodTypeBuild).Return(map[string]string{}),
389389
)
390390

391391
actual, err := m.MakePodTemplate(ctx, &mld, mld.Owner, false)
@@ -422,7 +422,7 @@ var _ = Describe("MakePodTemplate", func() {
422422
return nil
423423
},
424424
),
425-
mockBuildSignPodManager.EXPECT().PodLabels(mld.Name, kernelNormalizedVersion, pod.PodTypeBuild).Return(map[string]string{}),
425+
mockBuildSignPodManager.EXPECT().PodLabels(mld.Name, kernelNormalizedVersion, PodTypeBuild).Return(map[string]string{}),
426426
)
427427

428428
actual, err := m.MakePodTemplate(ctx, &mld, mld.Owner, true)

‎internal/build/pod/manager.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ import (
1717
"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
1818
)
1919

20+
const (
21+
PodTypeBuild = "build"
22+
PodTypeSign = "sign"
23+
)
24+
2025
type podManager struct {
2126
client client.Client
2227
maker Maker
@@ -38,7 +43,7 @@ func NewBuildManager(
3843
}
3944

4045
func (pm *podManager) GarbageCollect(ctx context.Context, modName, namespace string, owner metav1.Object) ([]string, error) {
41-
pods, err := pm.buildSignPodManager.GetModulePods(ctx, modName, namespace, pod.PodTypeBuild, owner)
46+
pods, err := pm.buildSignPodManager.GetModulePods(ctx, modName, namespace, PodTypeBuild, owner)
4247
if err != nil {
4348
return nil, fmt.Errorf("failed to get build pods for module %s: %v", modName, err)
4449
}
@@ -98,7 +103,7 @@ func (pm *podManager) Sync(
98103
}
99104

100105
p, err := pm.buildSignPodManager.GetModulePodByKernel(ctx, mld.Name, mld.Namespace,
101-
mld.KernelNormalizedVersion, pod.PodTypeBuild, owner)
106+
mld.KernelNormalizedVersion, PodTypeBuild, owner)
102107

103108
if err != nil {
104109
if !errors.Is(err, pod.ErrNoMatchingPod) {

‎internal/build/pod/manager_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ var _ = Describe("Sync", func() {
177177
gomock.InOrder(
178178
maker.EXPECT().MakePodTemplate(ctx, mld, mld.Owner, true).Return(&j, nil),
179179
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mld.Name, mld.Namespace,
180-
kernelNormalizedVersion, pod.PodTypeBuild, mld.Owner).Return(&j, nil),
180+
kernelNormalizedVersion, PodTypeBuild, mld.Owner).Return(&j, nil),
181181
mockBuildSignPodManager.EXPECT().IsPodChanged(&j, &j).Return(false, nil),
182182
mockBuildSignPodManager.EXPECT().GetPodStatus(&j).Return(podStatus, nil),
183183
)
@@ -230,7 +230,7 @@ var _ = Describe("Sync", func() {
230230
gomock.InOrder(
231231
maker.EXPECT().MakePodTemplate(ctx, mld, mld.Owner, true).Return(&j, nil),
232232
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mld.Name, mld.Namespace,
233-
kernelNormalizedVersion, pod.PodTypeBuild, mld.Owner).Return(nil, pod.ErrNoMatchingPod),
233+
kernelNormalizedVersion, PodTypeBuild, mld.Owner).Return(nil, pod.ErrNoMatchingPod),
234234
mockBuildSignPodManager.EXPECT().CreatePod(ctx, &j).Return(errors.New("some error")),
235235
)
236236

@@ -260,7 +260,7 @@ var _ = Describe("Sync", func() {
260260
gomock.InOrder(
261261
maker.EXPECT().MakePodTemplate(ctx, mld, mld.Owner, true).Return(&j, nil),
262262
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mld.Name, mld.Namespace,
263-
kernelNormalizedVersion, pod.PodTypeBuild, mld.Owner).Return(nil, pod.ErrNoMatchingPod),
263+
kernelNormalizedVersion, PodTypeBuild, mld.Owner).Return(nil, pod.ErrNoMatchingPod),
264264
mockBuildSignPodManager.EXPECT().CreatePod(ctx, &j).Return(nil),
265265
)
266266

@@ -303,7 +303,7 @@ var _ = Describe("Sync", func() {
303303
gomock.InOrder(
304304
maker.EXPECT().MakePodTemplate(ctx, mld, mld.Owner, true).Return(&newPod, nil),
305305
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mld.Name, mld.Namespace,
306-
kernelNormalizedVersion, pod.PodTypeBuild, mld.Owner).Return(&j, nil),
306+
kernelNormalizedVersion, PodTypeBuild, mld.Owner).Return(&j, nil),
307307
mockBuildSignPodManager.EXPECT().IsPodChanged(&j, &newPod).Return(true, nil),
308308
mockBuildSignPodManager.EXPECT().DeletePod(ctx, &j).Return(nil),
309309
)
@@ -370,7 +370,7 @@ var _ = Describe("GarbageCollect", func() {
370370
}
371371

372372
mockBuildSignPodManager.EXPECT().GetModulePods(context.Background(), mod.Name,
373-
mod.Namespace, pod.PodTypeBuild, &mod).Return([]v1.Pod{pod1, pod2}, returnedError)
373+
mod.Namespace, PodTypeBuild, &mod).Return([]v1.Pod{pod1, pod2}, returnedError)
374374
if !expectsErr {
375375
if pod1.Status.Phase == v1.PodSucceeded {
376376
mockBuildSignPodManager.EXPECT().DeletePod(context.Background(), &pod1).Return(nil)

‎internal/buildsign/pod/buildsignpodmanager.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
1515

16+
kmmv1beta1 "github.com/kubernetes-sigs/kernel-module-management/api/v1beta1"
1617
"github.com/kubernetes-sigs/kernel-module-management/internal/api"
1718
"github.com/kubernetes-sigs/kernel-module-management/internal/constants"
1819
"github.com/kubernetes-sigs/kernel-module-management/internal/module"
@@ -21,9 +22,6 @@ import (
2122
type Status string
2223

2324
const (
24-
PodTypeBuild = "build"
25-
PodTypeSign = "sign"
26-
2725
StatusCompleted Status = "completed"
2826
StatusCreated Status = "created"
2927
StatusInProgress Status = "in progress"
@@ -213,7 +211,7 @@ func (bspm *buildSignPodManager) MakeBuildResourceTemplate(ctx context.Context,
213211
ObjectMeta: metav1.ObjectMeta{
214212
GenerateName: mld.Name + "-build-",
215213
Namespace: mld.Namespace,
216-
Labels: bspm.PodLabels(mld.Name, mld.KernelNormalizedVersion, PodTypeBuild),
214+
Labels: bspm.PodLabels(mld.Name, mld.KernelNormalizedVersion, string(kmmv1beta1.BuildImage)),
217215
Annotations: map[string]string{constants.PodHashAnnotation: fmt.Sprintf("%d", podSpecHash)},
218216
Finalizers: []string{constants.GCDelayFinalizer, constants.JobEventFinalizer},
219217
},
@@ -267,7 +265,7 @@ func (bspm *buildSignPodManager) MakeSignResourceTemplate(ctx context.Context, m
267265
ObjectMeta: metav1.ObjectMeta{
268266
GenerateName: mld.Name + "-sign-",
269267
Namespace: mld.Namespace,
270-
Labels: bspm.PodLabels(mld.Name, mld.KernelNormalizedVersion, PodTypeSign),
268+
Labels: bspm.PodLabels(mld.Name, mld.KernelNormalizedVersion, string(kmmv1beta1.SignImage)),
271269
Annotations: map[string]string{
272270
constants.PodHashAnnotation: fmt.Sprintf("%d", podSpecHash),
273271
dockerfileAnnotationKey: buf.String(),

‎internal/buildsign/pod/buildsignpodmanager_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ var _ = Describe("MakeBuildResourceTemplate", func() {
581581
ObjectMeta: metav1.ObjectMeta{
582582
GenerateName: mld.Name + "-build-",
583583
Namespace: namespace,
584-
Labels: buildSignPodManager.PodLabels(mld.Name, mld.KernelNormalizedVersion, PodTypeBuild),
584+
Labels: buildSignPodManager.PodLabels(mld.Name, mld.KernelNormalizedVersion, string(kmmv1beta1.BuildImage)),
585585
OwnerReferences: []metav1.OwnerReference{
586586
{
587587
APIVersion: "kmm.sigs.x-k8s.io/v1beta1",
@@ -1024,7 +1024,7 @@ COPY --from=signimage /tmp/signroot/modules/simple-procfs-kmod.ko /modules/simpl
10241024
ObjectMeta: metav1.ObjectMeta{
10251025
GenerateName: mld.Name + "-sign-",
10261026
Namespace: namespace,
1027-
Labels: buildSignPodManager.PodLabels(mld.Name, mld.KernelNormalizedVersion, PodTypeSign),
1027+
Labels: buildSignPodManager.PodLabels(mld.Name, mld.KernelNormalizedVersion, string(kmmv1beta1.SignImage)),
10281028
OwnerReferences: []metav1.OwnerReference{
10291029
{
10301030
APIVersion: "kmm.sigs.x-k8s.io/v1beta1",

‎internal/buildsign/pod/manager.go‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,9 @@ func NewManager(client client.Client, combiner module.Combiner, scheme *runtime.
3434

3535
func (pm *podManager) GetStatus(ctx context.Context, name, namespace, kernelVersion string,
3636
action kmmv1beta1.BuildOrSignAction, owner metav1.Object) (kmmv1beta1.BuildOrSignStatus, error) {
37-
podType := PodTypeBuild
38-
if action == kmmv1beta1.SignImage {
39-
podType = PodTypeSign
40-
}
37+
4138
normalizedKernel := kernel.NormalizeVersion(kernelVersion)
42-
foundPod, err := pm.buildSignPodManager.GetModulePodByKernel(ctx, name, namespace, normalizedKernel, podType, owner)
39+
foundPod, err := pm.buildSignPodManager.GetModulePodByKernel(ctx, name, namespace, normalizedKernel, string(action), owner)
4340
if err != nil {
4441
if !errors.Is(err, ErrNoMatchingPod) {
4542
return kmmv1beta1.BuildOrSignStatus(""), fmt.Errorf("failed to get pod %s/%s, action %s: %v", namespace, name, action, err)
@@ -63,20 +60,18 @@ func (pm *podManager) GetStatus(ctx context.Context, name, namespace, kernelVers
6360
}
6461

6562
func (pm *podManager) Sync(ctx context.Context, mld *api.ModuleLoaderData, pushImage bool, action kmmv1beta1.BuildOrSignAction, owner metav1.Object) error {
63+
6664
logger := log.FromContext(ctx)
6765
var (
68-
podType string
6966
podTemplate *v1.Pod
7067
err error
7168
)
7269
switch action {
7370
case kmmv1beta1.BuildImage:
7471
logger.Info("Building in-cluster")
75-
podType = PodTypeBuild
7672
podTemplate, err = pm.buildSignPodManager.MakeBuildResourceTemplate(ctx, mld, owner, pushImage)
7773
case kmmv1beta1.SignImage:
7874
logger.Info("Signing in-cluster")
79-
podType = PodTypeSign
8075
podTemplate, err = pm.buildSignPodManager.MakeSignResourceTemplate(ctx, mld, owner, pushImage)
8176
default:
8277
return fmt.Errorf("invalid action %s", action)
@@ -87,11 +82,11 @@ func (pm *podManager) Sync(ctx context.Context, mld *api.ModuleLoaderData, pushI
8782
}
8883

8984
p, err := pm.buildSignPodManager.GetModulePodByKernel(ctx, mld.Name, mld.Namespace,
90-
mld.KernelNormalizedVersion, podType, owner)
85+
mld.KernelNormalizedVersion, string(action), owner)
9186

9287
if err != nil {
9388
if !errors.Is(err, ErrNoMatchingPod) {
94-
return fmt.Errorf("error getting the %s pod: %v", podType, err)
89+
return fmt.Errorf("error getting the %s pod: %v", action, err)
9590
}
9691

9792
logger.Info("Creating pod")
@@ -112,21 +107,18 @@ func (pm *podManager) Sync(ctx context.Context, mld *api.ModuleLoaderData, pushI
112107
logger.Info("The module's spec has been changed, deleting the current pod so a new one can be created", "name", p.Name, "action", action)
113108
err = pm.buildSignPodManager.DeletePod(ctx, p)
114109
if err != nil {
115-
logger.Info(utils.WarnString(fmt.Sprintf("failed to delete %s pod %s: %v", podType, p.Name, err)))
110+
logger.Info(utils.WarnString(fmt.Sprintf("failed to delete %s pod %s: %v", action, p.Name, err)))
116111
}
117112
}
118113

119114
return nil
120115
}
121116

122117
func (pm *podManager) GarbageCollect(ctx context.Context, name, namespace string, action kmmv1beta1.BuildOrSignAction, owner metav1.Object) ([]string, error) {
123-
podType := PodTypeBuild
124-
if action == kmmv1beta1.SignImage {
125-
podType = PodTypeSign
126-
}
127-
pods, err := pm.buildSignPodManager.GetModulePods(ctx, name, namespace, podType, owner)
118+
119+
pods, err := pm.buildSignPodManager.GetModulePods(ctx, name, namespace, string(action), owner)
128120
if err != nil {
129-
return nil, fmt.Errorf("failed to get %s pods for mbsc %s/%s: %v", podType, namespace, name, err)
121+
return nil, fmt.Errorf("failed to get %s pods for mbsc %s/%s: %v", action, namespace, name, err)
130122
}
131123

132124
logger := log.FromContext(ctx)
@@ -137,7 +129,7 @@ func (pm *podManager) GarbageCollect(ctx context.Context, name, namespace string
137129
err = pm.buildSignPodManager.DeletePod(ctx, &pod)
138130
errs = append(errs, err)
139131
if err != nil {
140-
logger.Info(utils.WarnString("failed to delete %s pod %s in garbage collection: %v"), podType, pod.Name, err)
132+
logger.Info(utils.WarnString("failed to delete %s pod %s in garbage collection: %v"), action, pod.Name, err)
141133
continue
142134
}
143135
deletePodsNames = append(deletePodsNames, pod.Name)

‎internal/buildsign/pod/manager_test.go‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ var _ = Describe("GetStatus", func() {
4545

4646
It("failed flow, GetModulePodByKernel fails", func() {
4747
normalizedKernel := kernel.NormalizeVersion(kernelVersion)
48-
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, normalizedKernel, PodTypeBuild, &testMBSC).
48+
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, normalizedKernel,
49+
string(kmmv1beta1.BuildImage), &testMBSC).
4950
Return(nil, fmt.Errorf("some error"))
5051

5152
status, err := mgr.GetStatus(ctx, mbscName, mbscNamespace, kernelVersion, kmmv1beta1.BuildImage, &testMBSC)
@@ -55,7 +56,8 @@ var _ = Describe("GetStatus", func() {
5556

5657
It("GetModulePodByKernel returns pod does not exists", func() {
5758
normalizedKernel := kernel.NormalizeVersion(kernelVersion)
58-
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, normalizedKernel, PodTypeBuild, &testMBSC).
59+
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, normalizedKernel,
60+
string(kmmv1beta1.BuildImage), &testMBSC).
5961
Return(nil, ErrNoMatchingPod)
6062

6163
status, err := mgr.GetStatus(ctx, mbscName, mbscNamespace, kernelVersion, kmmv1beta1.BuildImage, &testMBSC)
@@ -67,7 +69,8 @@ var _ = Describe("GetStatus", func() {
6769
foundPod := v1.Pod{}
6870
normalizedKernel := kernel.NormalizeVersion(kernelVersion)
6971
gomock.InOrder(
70-
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, normalizedKernel, PodTypeBuild, &testMBSC).
72+
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, normalizedKernel,
73+
string(kmmv1beta1.BuildImage), &testMBSC).
7174
Return(&foundPod, nil),
7275
mockBuildSignPodManager.EXPECT().GetPodStatus(&foundPod).Return(Status(""), fmt.Errorf("some error")),
7376
)
@@ -81,7 +84,8 @@ var _ = Describe("GetStatus", func() {
8184
foundPod := v1.Pod{}
8285
normalizedKernel := kernel.NormalizeVersion(kernelVersion)
8386
gomock.InOrder(
84-
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, normalizedKernel, PodTypeBuild, &testMBSC).
87+
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, normalizedKernel,
88+
string(kmmv1beta1.BuildImage), &testMBSC).
8589
Return(&foundPod, nil),
8690
mockBuildSignPodManager.EXPECT().GetPodStatus(&foundPod).Return(podStatus, nil),
8791
)
@@ -143,7 +147,8 @@ var _ = Describe("Sync", func() {
143147
It("GetModulePodByKernel failed", func() {
144148
gomock.InOrder(
145149
mockBuildSignPodManager.EXPECT().MakeBuildResourceTemplate(ctx, testMLD, &testMBSC, true).Return(nil, nil),
146-
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion, PodTypeBuild, &testMBSC).
150+
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion,
151+
string(kmmv1beta1.BuildImage), &testMBSC).
147152
Return(nil, fmt.Errorf("some error")),
148153
)
149154
err := mgr.Sync(ctx, testMLD, true, kmmv1beta1.BuildImage, &testMBSC)
@@ -154,7 +159,8 @@ var _ = Describe("Sync", func() {
154159
testTemplate := v1.Pod{}
155160
gomock.InOrder(
156161
mockBuildSignPodManager.EXPECT().MakeBuildResourceTemplate(ctx, testMLD, &testMBSC, true).Return(&testTemplate, nil),
157-
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion, PodTypeBuild, &testMBSC).
162+
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion,
163+
string(kmmv1beta1.BuildImage), &testMBSC).
158164
Return(nil, ErrNoMatchingPod),
159165
mockBuildSignPodManager.EXPECT().CreatePod(ctx, &testTemplate).Return(fmt.Errorf("some error")),
160166
)
@@ -167,7 +173,8 @@ var _ = Describe("Sync", func() {
167173
testPod := v1.Pod{}
168174
gomock.InOrder(
169175
mockBuildSignPodManager.EXPECT().MakeBuildResourceTemplate(ctx, testMLD, &testMBSC, true).Return(&testTemplate, nil),
170-
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion, PodTypeBuild, &testMBSC).
176+
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion,
177+
string(kmmv1beta1.BuildImage), &testMBSC).
171178
Return(&testPod, nil),
172179
mockBuildSignPodManager.EXPECT().IsPodChanged(&testPod, &testTemplate).Return(false, fmt.Errorf("some error")),
173180
)
@@ -180,7 +187,8 @@ var _ = Describe("Sync", func() {
180187
testPod := v1.Pod{}
181188
gomock.InOrder(
182189
mockBuildSignPodManager.EXPECT().MakeBuildResourceTemplate(ctx, testMLD, &testMBSC, true).Return(&testTemplate, nil),
183-
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion, PodTypeBuild, &testMBSC).
190+
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion,
191+
string(kmmv1beta1.BuildImage), &testMBSC).
184192
Return(&testPod, nil),
185193
mockBuildSignPodManager.EXPECT().IsPodChanged(&testPod, &testTemplate).Return(true, nil),
186194
mockBuildSignPodManager.EXPECT().DeletePod(ctx, &testPod).Return(fmt.Errorf("some error")),
@@ -190,12 +198,10 @@ var _ = Describe("Sync", func() {
190198
})
191199

192200
DescribeTable("check good flow", func(buildAction, podExists, podChanged, pushImage bool) {
193-
testAction := kmmv1beta1.BuildImage
194201
testPodTemplate := v1.Pod{}
195202
existingTestPod := v1.Pod{}
196-
podType := PodTypeBuild
203+
testAction := kmmv1beta1.BuildImage
197204
if !buildAction {
198-
podType = PodTypeSign
199205
testAction = kmmv1beta1.SignImage
200206
}
201207

@@ -208,7 +214,8 @@ var _ = Describe("Sync", func() {
208214
if !podExists {
209215
getPodError = ErrNoMatchingPod
210216
}
211-
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion, podType, &testMBSC).Return(&existingTestPod, getPodError)
217+
mockBuildSignPodManager.EXPECT().GetModulePodByKernel(ctx, mbscName, mbscNamespace, kernelVersion,
218+
string(testAction), &testMBSC).Return(&existingTestPod, getPodError)
212219
if !podExists {
213220
mockBuildSignPodManager.EXPECT().CreatePod(ctx, &testPodTemplate).Return(nil)
214221
goto executeTestFunction
@@ -259,7 +266,8 @@ var _ = Describe("GarbageCollect", func() {
259266
testMBSC := kmmv1beta1.ModuleBuildSignConfig{}
260267

261268
It("failed to get module pods", func() {
262-
mockBuildSignPodManager.EXPECT().GetModulePods(ctx, mbscName, mbscNamespace, PodTypeBuild, &testMBSC).Return(nil, fmt.Errorf("some error"))
269+
mockBuildSignPodManager.EXPECT().GetModulePods(ctx, mbscName, mbscNamespace,
270+
string(kmmv1beta1.BuildImage), &testMBSC).Return(nil, fmt.Errorf("some error"))
263271

264272
_, err := mgr.GarbageCollect(ctx, mbscName, mbscNamespace, kmmv1beta1.BuildImage, &testMBSC)
265273
Expect(err).To(HaveOccurred())
@@ -272,7 +280,7 @@ var _ = Describe("GarbageCollect", func() {
272280
},
273281
}
274282
gomock.InOrder(
275-
mockBuildSignPodManager.EXPECT().GetModulePods(ctx, mbscName, mbscNamespace, PodTypeSign, &testMBSC).
283+
mockBuildSignPodManager.EXPECT().GetModulePods(ctx, mbscName, mbscNamespace, string(kmmv1beta1.SignImage), &testMBSC).
276284
Return([]v1.Pod{testPod}, nil),
277285
mockBuildSignPodManager.EXPECT().DeletePod(ctx, &testPod).Return(fmt.Errorf("some error")),
278286
)
@@ -304,7 +312,7 @@ var _ = Describe("GarbageCollect", func() {
304312
}
305313
returnedPods := []v1.Pod{testPodSuccess, testPodFailure, testPodRunning, testPodUnknown, testPodPending}
306314
gomock.InOrder(
307-
mockBuildSignPodManager.EXPECT().GetModulePods(ctx, mbscName, mbscNamespace, PodTypeBuild, &testMBSC).
315+
mockBuildSignPodManager.EXPECT().GetModulePods(ctx, mbscName, mbscNamespace, string(kmmv1beta1.BuildImage), &testMBSC).
308316
Return(returnedPods, nil),
309317
mockBuildSignPodManager.EXPECT().DeletePod(ctx, &testPodSuccess).Return(nil),
310318
)

0 commit comments

Comments
 (0)