modify

Signed-off-by: Rui Zhang <[email protected]>

Author: zerofishnoodles

operator/config/default/kustomization.yaml

@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: production-stack-system
+namespace: default
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
@@ -18,6 +18,7 @@ resources:
   - ../crd
   - ../rbac
   - ../manager
+  - ../storage
   # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
   # crd/kustomization.yaml
   #- ../webhook

operator/config/manager/deployment.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: production-stack-controller-manager
+  name: controller-manager
   namespace: production-stack-system
   labels:
     app.kubernetes.io/name: production-stack
@@ -86,7 +86,7 @@ spec:
             requests:
               cpu: 10m
               memory: 64Mi
-          volumeMounts:
+          volumeMounts: 
             - name: shared-pvc-storage
               mountPath: /data/shared-pvc-storage
       volumes:

operator/config/manager/kustomization.yaml

@@ -1,10 +1,8 @@
-resources:
-- namespace.yaml
-- deployment.yaml
-- pvc.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
   newName: controller
   newTag: latest
+resources:
+- deployment.yaml

operator/config/storage/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- pvc.yaml

operator/config/manager/pvc.yaml renamed to operator/config/storage/pvc.yaml

@@ -20,7 +20,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: shared-pvc-storage-claim
-  namespace: production-stack-system
+  namespace: default
   labels:
     app: production-stack
     component: shared-pvc-storage

operator/internal/controller/vllmruntime_controller.go

@@ -107,40 +107,6 @@ func (r *VLLMRuntimeReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{Requeue: true}, nil
 	}
 
-	// Check if the pv already exists, if not create a new one
-	foundPV := &corev1.PersistentVolume{}
-	err = r.Get(ctx, types.NamespacedName{Name: "shared-pvc-storage", Namespace: vllmRuntime.Namespace}, foundPV)
-	if err != nil && errors.IsNotFound(err) {
-		// Define a new pv
-		pv := r.pvForVLLMRuntime(vllmRuntime)
-		log.Info("Creating a new PV", "PV.Namespace", pv.Namespace, "PV.Name", pv.Name)
-		err = r.Create(ctx, pv)
-		if err != nil {
-			log.Error(err, "Failed to create new PV", "PV.Namespace", pv.Namespace, "PV.Name", pv.Name)
-			return ctrl.Result{}, err
-		}
-	} else if err != nil {
-		log.Error(err, "Failed to get PV")
-		return ctrl.Result{}, err
-	}
-
-	// Check if the pvc already exists, if not create a new one
-	foundPVC := &corev1.PersistentVolumeClaim{}
-	err = r.Get(ctx, types.NamespacedName{Name: "shared-pvc-storage-claim", Namespace: vllmRuntime.Namespace}, foundPVC)
-	if err != nil && errors.IsNotFound(err) {
-		// Define a new pvc
-		pvc := r.pvcForVLLMRuntime(vllmRuntime)
-		log.Info("Creating a new PVC", "PVC.Namespace", pvc.Namespace, "PVC.Name", pvc.Name)
-		err = r.Create(ctx, pvc)
-		if err != nil {
-			log.Error(err, "Failed to create new PVC", "PVC.Namespace", pvc.Namespace, "PVC.Name", pvc.Name)
-			return ctrl.Result{}, err
-		}
-	} else if err != nil {
-		log.Error(err, "Failed to get PVC")
-		return ctrl.Result{}, err
-	}
-
 	// Check if the deployment already exists, if not create a new one
 	found := &appsv1.Deployment{}
 	err = r.Get(ctx, types.NamespacedName{Name: vllmRuntime.Name, Namespace: vllmRuntime.Namespace}, found)
@@ -184,43 +150,6 @@ func (r *VLLMRuntimeReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	return ctrl.Result{}, nil
 }
 
-func (r *VLLMRuntimeReconciler) pvForVLLMRuntime(vllmRuntime *productionstackv1alpha1.VLLMRuntime) *corev1.PersistentVolume {
-	return &corev1.PersistentVolume{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "shared-pvc-storage",
-			Namespace: vllmRuntime.Namespace,
-			Labels:    map[string]string{"app": vllmRuntime.Name},
-		},
-		Spec: corev1.PersistentVolumeSpec{
-			AccessModes:      []corev1.PersistentVolumeAccessMode{corev1.ReadWriteMany},
-			StorageClassName: "",
-			Capacity:         corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("100Gi")},
-			PersistentVolumeSource: corev1.PersistentVolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: "/data/shared-pvc-storage",
-				},
-			},
-		},
-	}
-}
-
-func (r *VLLMRuntimeReconciler) pvcForVLLMRuntime(vllmRuntime *productionstackv1alpha1.VLLMRuntime) *corev1.PersistentVolumeClaim {
-	return &corev1.PersistentVolumeClaim{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "shared-pvc-storage-claim",
-			Namespace: vllmRuntime.Namespace,
-			Labels:    map[string]string{"app": vllmRuntime.Name},
-		},
-		Spec: corev1.PersistentVolumeClaimSpec{
-			AccessModes:      []corev1.PersistentVolumeAccessMode{corev1.ReadWriteMany},
-			StorageClassName: &[]string{""}[0],
-			Resources: corev1.VolumeResourceRequirements{
-				Requests: corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("100Gi")},
-			},
-		},
-	}
-}
-
 // deploymentForVLLMRuntime returns a VLLMRuntime Deployment object
 func (r *VLLMRuntimeReconciler) deploymentForVLLMRuntime(vllmRuntime *productionstackv1alpha1.VLLMRuntime) *appsv1.Deployment {
 	labels := map[string]string{"app": vllmRuntime.Name}
@@ -252,11 +181,11 @@ func (r *VLLMRuntimeReconciler) deploymentForVLLMRuntime(vllmRuntime *production
 				Scheme: corev1.URISchemeHTTP,
 			},
 		},
-		InitialDelaySeconds: 500,
-		PeriodSeconds:       10,
+		InitialDelaySeconds: 300,
+		PeriodSeconds:       20,
 		TimeoutSeconds:      3,
 		SuccessThreshold:    1,
-		FailureThreshold:    3,
+		FailureThreshold:    10,
 	}
 
 	// Build command line arguments
@@ -520,7 +449,7 @@ func (r *VLLMRuntimeReconciler) deploymentForVLLMRuntime(vllmRuntime *production
 							Name: "shared-pvc-storage",
 							VolumeSource: corev1.VolumeSource{
 								PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
-									ClaimName: "shared-pvc-storage-claim",
+									ClaimName: "production-stack-shared-pvc-storage-claim",
 								},
 							},
 						},