RHOAIENG-34472: GIE v1 Migration

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM golang:1.24.7 AS builder
 
 # Copy in the go src
 WORKDIR /go/src/github.com/kserve/kserve

agent.Dockerfile

@@ -1,5 +1,5 @@
 # Build the inference-agent binary
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24 AS builder
+FROM golang:1.24.7 AS builder
 
 # Copy in the go src
 WORKDIR /go/src/github.com/kserve/kserve

charts/kserve-resources/templates/clusterrole.yaml

@@ -66,6 +66,18 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  - customresourcedefinitions/status
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - apps
   resources:
@@ -121,17 +133,6 @@ rules:
   - watch
 - apiGroups:
   - inference.networking.k8s.io
-  resources:
-  - inferencepools
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
   - inference.networking.x-k8s.io
   resources:
   - inferencemodels

cmd/manager/main.go

@@ -21,19 +21,27 @@ import (
 	"flag"
 	"net/http"
 	"os"
+	"time"
 
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"knative.dev/pkg/apiextensions/storageversion"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/kserve/kserve/pkg/apis"
+	"github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
+
 	kedav1alpha1 "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
 	otelv1beta1 "github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 	istio_networking "istio.io/api/networking/v1alpha3"
 	istioclientv1beta1 "istio.io/client-go/pkg/apis/networking/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
+	apixclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
@@ -52,12 +60,11 @@ import (
 
 	routev1 "github.com/openshift/api/route/v1"
 
-	"github.com/kserve/kserve/pkg/controller/llmisvc"
-	llmisvcvalidation "github.com/kserve/kserve/pkg/controller/llmisvc/validation"
-
-	"github.com/kserve/kserve/pkg/apis/serving/v1alpha1"
+	v1alpha1validation "github.com/kserve/kserve/pkg/apis/serving/v1alpha1/validation"
+	v1alpha2validation "github.com/kserve/kserve/pkg/apis/serving/v1alpha2/validation"
 	"github.com/kserve/kserve/pkg/apis/serving/v1beta1"
 	"github.com/kserve/kserve/pkg/constants"
+	"github.com/kserve/kserve/pkg/controller/llmisvc"
 	graphcontroller "github.com/kserve/kserve/pkg/controller/v1alpha1/inferencegraph"
 	trainedmodelcontroller "github.com/kserve/kserve/pkg/controller/v1alpha1/trainedmodel"
 	"github.com/kserve/kserve/pkg/controller/v1alpha1/trainedmodel/reconcilers/modelconfig"
@@ -181,17 +188,11 @@ func main() {
 	setupLog.Info("Setting up KServe v1alpha1 scheme")
 	scheme := mgr.GetScheme()
 
-	if err := v1alpha1.AddToScheme(scheme); err != nil {
+	if err := apis.AddToScheme(scheme); err != nil {
 		setupLog.Error(err, "unable to add KServe v1alpha1 to scheme")
 		os.Exit(1)
 	}
 
-	setupLog.Info("Setting up KServe v1beta1 scheme")
-	if err := v1beta1.AddToScheme(scheme); err != nil {
-		setupLog.Error(err, "unable to add KServe v1beta1 to scheme")
-		os.Exit(1)
-	}
-
 	isvcConfigMap, err := v1beta1.GetInferenceServiceConfigMap(context.Background(), clientSet)
 	if err != nil {
 		setupLog.Error(err, "unable to get configmap", "name", constants.InferenceServiceConfigMapName, "namespace", constants.KServeNamespace)
@@ -324,10 +325,16 @@ func main() {
 	setupLog.Info("Setting up LLMInferenceService controller")
 	llmEventBroadcaster := record.NewBroadcaster()
 	llmEventBroadcaster.StartRecordingToSink(&typedcorev1.EventSinkImpl{Interface: clientSet.CoreV1().Events("")})
+	dynamicClient, err := dynamic.NewForConfig(mgr.GetConfig())
+	if err != nil {
+		setupLog.Error(err, "unable to create dynamic client")
+		os.Exit(1)
+	}
 	if err = (&llmisvc.LLMInferenceServiceReconciler{
 		Client:        mgr.GetClient(),
 		Config:        mgr.GetConfig(),
 		Clientset:     clientSet,
+		DynamicClient: dynamicClient,
 		EventRecorder: llmEventBroadcaster.NewRecorder(scheme, corev1.EventSource{Component: "LLMInferenceServiceController"}),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "v1beta1Controller", "InferenceService")
@@ -415,16 +422,19 @@ func main() {
 		os.Exit(1)
 	}
 
-	llmConfigValidator := &llmisvcvalidation.LLMInferenceServiceConfigValidator{
-		ClientSet: clientSet,
+	if err = (&v1alpha1validation.LLMInferenceServiceConfigValidator{ClientSet: clientSet}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create webhook", "webhook", "llminferenceserviceconfig")
+		os.Exit(1)
 	}
-	if err = llmConfigValidator.SetupWithManager(mgr); err != nil {
+	if err = (&v1alpha1validation.LLMInferenceServiceValidator{}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create webhook", "webhook", "llminferenceservice")
+		os.Exit(1)
+	}
+	if err = (&v1alpha2validation.LLMInferenceServiceConfigValidator{ClientSet: clientSet}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create webhook", "webhook", "llminferenceserviceconfig")
 		os.Exit(1)
 	}
-
-	llmInferenceServiceValidator := &llmisvcvalidation.LLMInferenceServiceValidator{}
-	if err = llmInferenceServiceValidator.SetupWithManager(mgr); err != nil {
+	if err = (&v1alpha2validation.LLMInferenceServiceValidator{}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create webhook", "webhook", "llminferenceservice")
 		os.Exit(1)
 	}
@@ -442,9 +452,37 @@ func main() {
 		os.Exit(1)
 	}
 
+	ctx := signals.SetupSignalHandler()
+
+	resources := []string{
+		"llminferenceserviceconfigs.serving.kserve.io",
+		"llminferenceservices.serving.kserve.io",
+	}
+
+	go func() {
+		migrator := storageversion.NewMigrator(dynamicClient, apixclient.NewForConfigOrDie(mgr.GetConfig()))
+
+		for {
+			time.Sleep(10 * time.Second)
+
+			allMigrated := true
+			for _, resource := range resources {
+				if err := migrator.Migrate(ctx, schema.ParseGroupResource(resource)); err != nil {
+					setupLog.Error(err, "Failed to migrate", "resource", resource)
+					allMigrated = false
+				}
+			}
+			if allMigrated {
+				return
+			}
+
+			setupLog.Info("Failed to migrate all resources, retrying ...", "resources", resources)
+		}
+	}()
+
 	// Start the Cmd
 	setupLog.Info("Starting the Cmd.")
-	if err := mgr.Start(signals.SetupSignalHandler()); err != nil {
+	if err := mgr.Start(ctx); err != nil {
 		setupLog.Error(err, "unable to run the manager")
 		os.Exit(1)
 	}

config/crd/full/kustomization.yaml

@@ -13,3 +13,7 @@ resources:
   - serving.kserve.io_localmodelnodes.yaml
   - serving.kserve.io_llminferenceserviceconfigs.yaml
   - serving.kserve.io_llminferenceservices.yaml
+
+patches:
+  - path: llmisvc_conversion_patch.yaml
+  - path: llmisvcconfig_conversion_patch.yaml

config/crd/full/llmisvc_conversion_patch.yaml

@@ -0,0 +1,17 @@
+# Adds conversion webhook configuration to LLMInferenceService CRD
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: llminferenceservices.serving.kserve.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: kserve-webhook-server-service
+          namespace: opendatahub
+          path: /convert
+      conversionReviewVersions:
+        - v1
+        - v1beta1

config/crd/full/llmisvcconfig_conversion_patch.yaml

@@ -0,0 +1,17 @@
+# Adds conversion webhook configuration to LLMInferenceServiceConfig CRD
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: llminferenceserviceconfigs.serving.kserve.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: kserve-webhook-server-service
+          namespace: opendatahub
+          path: /convert
+      conversionReviewVersions:
+        - v1
+        - v1beta1