Skip to content

Commit

Permalink
Renaming module-nmc controller to module. (#1322)
Browse files Browse the repository at this point in the history
The controller is going to be modified to to reconcile the `Module` and
generate out of it and `ModuleImagesConfig` CR and another new CR that
will be reconciled by a new controller that will generate build/sign pods.

Signed-off-by: Yoni Bettan <[email protected]>
  • Loading branch information
ybettan authored Jan 30, 2025
1 parent cb1b7a0 commit 1258f4b
Show file tree
Hide file tree
Showing 8 changed files with 227 additions and 400 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2025-01-29T18:54:10Z"
createdAt: "2025-01-30T12:27:43Z"
operatorframework.io/suggested-namespace: openshift-kmm-hub
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2025-01-30T11:16:28Z"
createdAt: "2025-01-30T12:27:42Z"
operatorframework.io/suggested-namespace: openshift-kmm
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down
7 changes: 4 additions & 3 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ package main
import (
"flag"
"fmt"
"github.com/rh-ecosystem-edge/kernel-module-management/internal/node"
"os"
"strconv"

"github.com/rh-ecosystem-edge/kernel-module-management/internal/node"

buildv1 "github.com/openshift/api/build/v1"
imagev1 "github.com/openshift/api/image/v1"
"github.com/rh-ecosystem-edge/kernel-module-management/api/v1beta1"
Expand Down Expand Up @@ -158,7 +159,7 @@ func main() {
cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.ModuleCAReconcilerName)
}

mnc := controllers.NewModuleNMCReconciler(
mnc := controllers.NewModuleReconciler(
client,
kernelAPI,
registryAPI,
Expand All @@ -170,7 +171,7 @@ func main() {
scheme,
)
if err = mnc.SetupWithManager(mgr, !managed); err != nil {
cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.ModuleNMCReconcilerName)
cmd.FatalError(setupLogger, err, "unable to create controller", "name", controllers.ModuleReconcilerName)
}

ctx := ctrl.SetupSignalHandler()
Expand Down
194 changes: 0 additions & 194 deletions internal/controllers/mock_module_nmc_reconciler.go

This file was deleted.

Loading

0 comments on commit 1258f4b

Please sign in to comment.