From 93f171f289cb4e6696f61e8a42ef8f1a62189768 Mon Sep 17 00:00:00 2001 From: yetone Date: Fri, 24 Jan 2025 15:13:29 +0800 Subject: [PATCH] fix: separate-models (#181) --- controllers/resources/bentorequest_controller.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/controllers/resources/bentorequest_controller.go b/controllers/resources/bentorequest_controller.go index cc86df8..22885c7 100644 --- a/controllers/resources/bentorequest_controller.go +++ b/controllers/resources/bentorequest_controller.go @@ -224,7 +224,7 @@ func (r *BentoRequestReconciler) Reconcile(ctx context.Context, req ctrl.Request var modelsExistsResult ctrl.Result var modelsExistsErr error - if separateModels { + if separateModels && !isImageStoredInS3(bentoRequest) { bentoRequest, modelsExists, modelsExistsResult, modelsExistsErr = r.ensureModelsExists(ctx, ensureModelsExistsOption{ bentoRequest: bentoRequest, req: req, @@ -268,7 +268,7 @@ func (r *BentoRequestReconciler) Reconcile(ctx context.Context, req ctrl.Request return } - if separateModels && modelsExists { + if separateModels && !isImageStoredInS3(bentoRequest) && modelsExists { // Delete PVCs for all seeded models for _, model := range bentoRequest.Spec.Models { model := model @@ -288,7 +288,7 @@ func (r *BentoRequestReconciler) Reconcile(ctx context.Context, req ctrl.Request } } - if separateModels && !modelsExists { + if separateModels && !isImageStoredInS3(bentoRequest) && !modelsExists { result = modelsExistsResult bentoRequest, err = r.setStatusConditions(ctx, req, metav1.Condition{ @@ -319,7 +319,7 @@ func (r *BentoRequestReconciler) Reconcile(ctx context.Context, req ctrl.Request }, } - if separateModels { + if separateModels && !isImageStoredInS3(bentoRequest) { bentoCR.Annotations = map[string]string{ commonconsts.KubeAnnotationYataiImageBuilderSeparateModels: commonconsts.KubeLabelValueTrue, commonconsts.KubeAnnotationAWSAccessKeySecretName: bentoRequest.Annotations[commonconsts.KubeAnnotationAWSAccessKeySecretName], @@ -1481,7 +1481,7 @@ func getBentoImageName(bentoRequest *resourcesv1alpha1.BentoRequest, dockerRegis } func isSeparateModels(bentoRequest *resourcesv1alpha1.BentoRequest) (separateModels bool) { - return bentoRequest.Annotations[commonconsts.KubeAnnotationYataiImageBuilderSeparateModels] == commonconsts.KubeLabelValueTrue && !isImageStoredInS3(bentoRequest) + return bentoRequest.Annotations[commonconsts.KubeAnnotationYataiImageBuilderSeparateModels] == commonconsts.KubeLabelValueTrue } func isImageStoredInS3(bentoRequest *resourcesv1alpha1.BentoRequest) (storedInS3 bool) {