feat: add volumeForceMount option to SuggestionConfig

Author: a9p

manifests/v1beta1/components/controller/katib-config.yaml

@@ -70,7 +70,8 @@ data:
               "storage": "5Gi"
             }
           }
-        }
+        },
+        "volumeForceMount": true
       }
     }
   early-stopping: |-

pkg/controller.v1beta1/suggestion/suggestion_controller.go

@@ -42,12 +42,12 @@ import (
 	"github.com/kubeflow/katib/pkg/controller.v1beta1/suggestion/composer"
 	"github.com/kubeflow/katib/pkg/controller.v1beta1/suggestion/suggestionclient"
 	"github.com/kubeflow/katib/pkg/controller.v1beta1/util"
+	"github.com/kubeflow/katib/pkg/util/v1beta1/katibconfig"
 )
 
 const (
 	ControllerName = "suggestion-controller"
 )
-var ReconcileSuggestionVolumeOverrides = [...] string {"pbt"}
 
 var log = logf.Log.WithName(ControllerName)
 
@@ -192,17 +192,14 @@ func (r *ReconcileSuggestion) ReconcileSuggestion(instance *suggestionsv1beta1.S
 	suggestionNsName := types.NamespacedName{Name: instance.GetName(), Namespace: instance.GetNamespace()}
 	logger := log.WithValues("Suggestion", suggestionNsName)
 
-	// Check if requested algorithm is in reconcile override list
-	isReconcileOverride := false
-	for _, algorithmName := range ReconcileSuggestionVolumeOverrides {
-		if algorithmName == instance.Spec.Algorithm.AlgorithmName {
-			isReconcileOverride = true
-			break
-		}
+	// Check if algorithm overrides volume reconcile policy
+	suggestionConfigData, err := katibconfig.GetSuggestionConfigData(instance.Spec.Algorithm.AlgorithmName, r.Client)
+	if err != nil {
+		return err
 	}
 
-	// If ResumePolicy = FromVolume volume is reconciled for suggestion
-	if isReconcileOverride || instance.Spec.ResumePolicy == experimentsv1beta1.FromVolume {
+	// If ResumePolicy = FromVolume (or overriden), volume is reconciled for suggestion
+	if suggestionConfigData.VolumeForceMount || instance.Spec.ResumePolicy == experimentsv1beta1.FromVolume {
 		pvc, pv, err := r.DesiredVolume(instance)
 		if err != nil {
 			return err

pkg/util/v1beta1/katibconfig/config.go

@@ -42,6 +42,7 @@ type SuggestionConfig struct {
 	PersistentVolumeClaimSpec corev1.PersistentVolumeClaimSpec `json:"persistentVolumeClaimSpec,omitempty"`
 	PersistentVolumeSpec      corev1.PersistentVolumeSpec      `json:"persistentVolumeSpec,omitempty"`
 	PersistentVolumeLabels    map[string]string                `json:"persistentVolumeLabels,omitempty"`
+	VolumeForceMount          bool                             `json:"volumeForceMount,omitempty"`
 }
 
 // EarlyStoppingConfig is the JSON early stopping structure in Katib config.