Skip to content

Commit 9109614

Browse files
Fixing build issue
Signed-off-by: Vishesh Tanksale <vtanksale@nvidia.com>
1 parent 9eb66b5 commit 9109614

4 files changed

Lines changed: 21 additions & 38 deletions

File tree

cmd/main.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import (
4444
appsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1"
4545
"github.com/NVIDIA/k8s-nim-operator/internal/conditions"
4646
"github.com/NVIDIA/k8s-nim-operator/internal/controller"
47-
"github.com/NVIDIA/k8s-nim-operator/internal/controller/platform"
4847
"github.com/NVIDIA/k8s-nim-operator/internal/render"
4948
webhookappsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/internal/webhook/apps/v1alpha1"
5049
// +kubebuilder:scaffold:imports
@@ -98,16 +97,13 @@ func main() {
9897
setupLog.Info("DEPRECATED: Global platform flag is deprecated. Use 'platform' field in NIMService CR instead.", "platform", platformType)
9998
switch platformType {
10099
case "standalone", "kserve":
101-
// Valid platform types
100+
// Valid platform types for the deprecated global platform flag. No need to throw an error.
102101
default:
103102
setupLog.Error(nil, "unsupported model-serving platform type", "platformType", platformType)
104103
os.Exit(1)
105104
}
106105
}
107106

108-
// Create platform factory
109-
platformFactory := platform.NewFactory()
110-
111107
// if the enable-http2 flag is false (the default), http/2 should be disabled
112108
// due to its vulnerabilities. More specifically, disabling http/2 will
113109
// prevent from being vulnerable to the HTTP/2 Stream Cancellation and
@@ -181,7 +177,6 @@ func main() {
181177
discoveryClient,
182178
render.NewRenderer("/manifests"),
183179
ctrl.Log.WithName("controllers").WithName("NIMService"),
184-
platformFactory,
185180
).SetupWithManager(mgr); err != nil {
186181
setupLog.Error(err, "unable to create controller", "controller", "NIMService")
187182
os.Exit(1)

internal/controller/nimservice_controller.go

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,30 +59,28 @@ const NIMServiceFinalizer = "finalizer.nimservice.apps.nvidia.com"
5959
// NIMServiceReconciler reconciles a NIMService object.
6060
type NIMServiceReconciler struct {
6161
client.Client
62-
scheme *runtime.Scheme
63-
log logr.Logger
64-
updater conditions.Updater
65-
discoveryClient discovery.DiscoveryInterface
66-
renderer render.Renderer
67-
Config *rest.Config
68-
InferencePlatformFactory *platform.Factory
69-
orchestratorType k8sutil.OrchestratorType
70-
recorder record.EventRecorder
62+
scheme *runtime.Scheme
63+
log logr.Logger
64+
updater conditions.Updater
65+
discoveryClient discovery.DiscoveryInterface
66+
renderer render.Renderer
67+
Config *rest.Config
68+
orchestratorType k8sutil.OrchestratorType
69+
recorder record.EventRecorder
7170
}
7271

7372
// Ensure NIMServiceReconciler implements the Reconciler interface.
7473
var _ shared.Reconciler = &NIMServiceReconciler{}
7574

7675
// NewNIMServiceReconciler creates a new reconciler for NIMService with the given platform factory.
77-
func NewNIMServiceReconciler(client client.Client, scheme *runtime.Scheme, updater conditions.Updater, discoveryClient discovery.DiscoveryInterface, renderer render.Renderer, log logr.Logger, platformFactory *platform.Factory) *NIMServiceReconciler {
76+
func NewNIMServiceReconciler(client client.Client, scheme *runtime.Scheme, updater conditions.Updater, discoveryClient discovery.DiscoveryInterface, renderer render.Renderer, log logr.Logger) *NIMServiceReconciler {
7877
return &NIMServiceReconciler{
79-
Client: client,
80-
scheme: scheme,
81-
updater: updater,
82-
discoveryClient: discoveryClient,
83-
renderer: renderer,
84-
log: log,
85-
InferencePlatformFactory: platformFactory,
78+
Client: client,
79+
scheme: scheme,
80+
updater: updater,
81+
discoveryClient: discoveryClient,
82+
renderer: renderer,
83+
log: log,
8684
}
8785
}
8886

@@ -134,7 +132,7 @@ func (r *NIMServiceReconciler) Reconcile(ctx context.Context, req ctrl.Request)
134132
logger.Info("Reconciling", "NIMService", nimService.Name)
135133

136134
// Get platform implementation based on NIMService's platform field
137-
platformImpl, err := r.InferencePlatformFactory.GetInferencePlatform(nimService.Spec.InferencePlatform)
135+
platformImpl, err := platform.GetInferencePlatform(nimService.Spec.InferencePlatform)
138136
if err != nil {
139137
logger.Error(err, "failed to get platform implementation", "platform", nimService.Spec.InferencePlatform)
140138
return ctrl.Result{}, err

internal/controller/nimservice_controller_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3737

3838
appsv1alpha1 "github.com/NVIDIA/k8s-nim-operator/api/apps/v1alpha1"
39-
"github.com/NVIDIA/k8s-nim-operator/internal/controller/platform"
4039
"github.com/NVIDIA/k8s-nim-operator/internal/utils"
4140
)
4241

@@ -68,10 +67,9 @@ var _ = Describe("NIMService Controller", func() {
6867
}).
6968
Build()
7069
reconciler = &NIMServiceReconciler{
71-
Client: testClient,
72-
scheme: scheme,
73-
InferencePlatformFactory: platform.NewFactory(),
74-
recorder: record.NewFakeRecorder(1000),
70+
Client: testClient,
71+
scheme: scheme,
72+
recorder: record.NewFakeRecorder(1000),
7573
}
7674
})
7775

internal/controller/platform/platform.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,8 @@ type InferencePlatform interface {
3535
Sync(ctx context.Context, r shared.Reconciler, resource client.Object) (ctrl.Result, error)
3636
}
3737

38-
// Factory provides platform implementations based on platform type.
39-
type Factory struct{}
40-
41-
// NewFactory creates a new platform factory.
42-
func NewFactory() *Factory {
43-
return &Factory{}
44-
}
45-
4638
// GetInferencePlatform returns an inference platform implementation based on the platform type.
47-
func (f *Factory) GetInferencePlatform(inferencePlatformType appsv1alpha1.PlatformType) (InferencePlatform, error) {
39+
func GetInferencePlatform(inferencePlatformType appsv1alpha1.PlatformType) (InferencePlatform, error) {
4840
switch inferencePlatformType {
4941
case appsv1alpha1.PlatformTypeStandalone, "": // Default to standalone for empty values
5042
return &standalone.Standalone{}, nil

0 commit comments

Comments
 (0)