Skip to content

Commit a037a54

Browse files
TomerNewmank8s-ci-robot
authored andcommitted
Cleanup module.ImageExists. module.ImageDigest functions and their dependencies
Since we now check if images exists using the new MIC object. Those functions are now redundant, this commit deletes them and their dependencies (registry and auth packages).
1 parent 970035a commit a037a54

File tree

18 files changed

+27
-1467
lines changed

18 files changed

+27
-1467
lines changed

cmd/manager-hub/main.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import (
5050
"github.com/kubernetes-sigs/kernel-module-management/internal/metrics"
5151
"github.com/kubernetes-sigs/kernel-module-management/internal/module"
5252
"github.com/kubernetes-sigs/kernel-module-management/internal/nmc"
53-
"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
5453
"github.com/kubernetes-sigs/kernel-module-management/internal/statusupdater"
5554
//+kubebuilder:scaffold:imports
5655
)
@@ -111,7 +110,6 @@ func main() {
111110
metricsAPI := metrics.New()
112111
metricsAPI.Register()
113112

114-
registryAPI := registry.NewRegistry()
115113
buildSignCombiner := module.NewCombiner()
116114
resourceManager := buildsignresource.NewResourceManager(client, buildSignCombiner, scheme)
117115

@@ -129,7 +127,7 @@ func main() {
129127
ctx := ctrl.SetupSignalHandler()
130128
mcmr := hub.NewManagedClusterModuleReconciler(
131129
client,
132-
manifestwork.NewCreator(client, scheme, kernelAPI, registryAPI, operatorNamespace),
130+
manifestwork.NewCreator(client, scheme, kernelAPI, operatorNamespace),
133131
cluster.NewClusterAPI(client, kernelAPI, operatorNamespace),
134132
statusupdater.NewManagedClusterModuleStatusUpdater(client),
135133
filterAPI,

cmd/manager/main.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ import (
3838
"github.com/kubernetes-sigs/kernel-module-management/internal/metrics"
3939
"github.com/kubernetes-sigs/kernel-module-management/internal/module"
4040
"github.com/kubernetes-sigs/kernel-module-management/internal/nmc"
41-
"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
42-
4341
"k8s.io/apimachinery/pkg/runtime"
4442
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
4543
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -116,7 +114,6 @@ func main() {
116114
metricsAPI := metrics.New()
117115
metricsAPI.Register()
118116

119-
registryAPI := registry.NewRegistry()
120117
buildSignCombinerAPI := module.NewCombiner()
121118
resourceManager := buildsignresource.NewResourceManager(client, buildSignCombinerAPI, scheme)
122119
nodeAPI := node.NewNode(client)
@@ -138,7 +135,6 @@ func main() {
138135
mnc := controllers.NewModuleReconciler(
139136
client,
140137
kernelAPI,
141-
registryAPI,
142138
nmcHelper,
143139
filterAPI,
144140
nodeAPI,

internal/auth/auth.go

Lines changed: 0 additions & 57 deletions
This file was deleted.

internal/auth/auth_test.go

Lines changed: 0 additions & 90 deletions
This file was deleted.

internal/auth/mock_auth.go

Lines changed: 0 additions & 55 deletions
This file was deleted.

internal/auth/suite_test.go

Lines changed: 0 additions & 40 deletions
This file was deleted.

internal/controllers/module_reconciler.go

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/kubernetes-sigs/kernel-module-management/internal/module"
1717
"github.com/kubernetes-sigs/kernel-module-management/internal/nmc"
1818
"github.com/kubernetes-sigs/kernel-module-management/internal/node"
19-
"github.com/kubernetes-sigs/kernel-module-management/internal/registry"
2019
"github.com/kubernetes-sigs/kernel-module-management/internal/utils"
2120
v1 "k8s.io/api/core/v1"
2221
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -72,13 +71,12 @@ type ModuleReconciler struct {
7271

7372
func NewModuleReconciler(client client.Client,
7473
kernelAPI module.KernelMapper,
75-
registryAPI registry.Registry,
7674
nmcHelper nmc.Helper,
7775
filter *filter.Filter,
7876
nodeAPI node.Node,
7977
micAPI mic.MIC,
8078
scheme *runtime.Scheme) *ModuleReconciler {
81-
reconHelper := newModuleReconcilerHelper(client, kernelAPI, registryAPI, micAPI, nmcHelper, scheme)
79+
reconHelper := newModuleReconcilerHelper(client, kernelAPI, micAPI, nmcHelper, scheme)
8280
return &ModuleReconciler{
8381
filter: filter,
8482
nsLabeler: newNamespaceLabeler(client),
@@ -195,28 +193,25 @@ type moduleReconcilerHelperAPI interface {
195193
}
196194

197195
type moduleReconcilerHelper struct {
198-
client client.Client
199-
kernelAPI module.KernelMapper
200-
registryAPI registry.Registry
201-
micAPI mic.MIC
202-
nmcHelper nmc.Helper
203-
scheme *runtime.Scheme
196+
client client.Client
197+
kernelAPI module.KernelMapper
198+
micAPI mic.MIC
199+
nmcHelper nmc.Helper
200+
scheme *runtime.Scheme
204201
}
205202

206203
func newModuleReconcilerHelper(
207204
client client.Client,
208205
kernelAPI module.KernelMapper,
209-
registryAPI registry.Registry,
210206
micAPI mic.MIC,
211207
nmcHelper nmc.Helper,
212208
scheme *runtime.Scheme) moduleReconcilerHelperAPI {
213209
return &moduleReconcilerHelper{
214-
client: client,
215-
kernelAPI: kernelAPI,
216-
registryAPI: registryAPI,
217-
micAPI: micAPI,
218-
nmcHelper: nmcHelper,
219-
scheme: scheme,
210+
client: client,
211+
kernelAPI: kernelAPI,
212+
micAPI: micAPI,
213+
nmcHelper: nmcHelper,
214+
scheme: scheme,
220215
}
221216
}
222217

0 commit comments

Comments
 (0)