Skip to content

Commit

Permalink
testing
Browse files Browse the repository at this point in the history
  • Loading branch information
vicentefb committed Apr 5, 2024
1 parent f84f2a2 commit 35ca648
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 4 deletions.
27 changes: 25 additions & 2 deletions pkg/controller/core/workload_controller.go
Expand Up @@ -26,6 +26,7 @@ import (
nodev1 "k8s.io/api/node/v1"
"k8s.io/apimachinery/pkg/api/equality"
apimeta "k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/types"
Expand All @@ -48,7 +49,6 @@ import (
"sigs.k8s.io/kueue/pkg/cache"
"sigs.k8s.io/kueue/pkg/constants"
"sigs.k8s.io/kueue/pkg/controller/core/indexer"
"sigs.k8s.io/kueue/pkg/features"
"sigs.k8s.io/kueue/pkg/queue"
"sigs.k8s.io/kueue/pkg/util/slices"
"sigs.k8s.io/kueue/pkg/workload"
Expand Down Expand Up @@ -203,7 +203,30 @@ func (r *WorkloadReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
return ctrl.Result{}, err
}
log.Info("[VICENTE] SIXTH IF WORKLAOD HAS QUOTA reconcileNotReadyTimeout", "wl", wl.Status.Admission)
workload.SyncAdmittedCondition(&wl)

log.Info("[VICENTE] PRINTING WL.STATUS.ADMISSIONS", "WL", wl.Status)
log.Info("[VICENTE] PRINTING WL.STATUS.ADMISSIONS", "wl.Status.Admission.PodSetAssignments[1]", wl.Status.Admission.PodSetAssignments[1])
log.Info("[VICENTE] PRINTING WL.STATUS.ADMISSIONS", "wl.Status.Admission.PodSetAssignments[1].Count", wl.Status.Admission.PodSetAssignments[1].Count)
log.Info("[VICENTE] PRINTING WL.SPEC", "wl.Spec.PodSets[1].Count", wl.Spec.PodSets[1].Count)
if ptr.Deref(wl.Status.Admission.PodSetAssignments[1].Count, 0) != wl.Spec.PodSets[1].Count {
log.Info("[VICENTE] CHANING THE ADMISSION COUNT")
log.Info("[VICENTE] PRINTING WL.STATUS.ADMISSIONS", "wl.Status.Admission.PodSetAssignments[1].Count", wl.Status.Admission.PodSetAssignments[1].Count)
log.Info("[VICENTE] PRINTING WL.SPEC", "wl.Spec.PodSets[1].Count", wl.Spec.PodSets[1].Count)
wl.Status.Admission.PodSetAssignments[1].Count = ptr.To(wl.Spec.PodSets[1].Count)
log.Info("[VICENTE] CPU: ", "CPU", wl.Status.Admission.PodSetAssignments[1].ResourceUsage.Cpu().ToDec())
log.Info("[VICENTE] MEMORY: ", "MEMORY", wl.Status.Admission.PodSetAssignments[1].ResourceUsage.Memory())
wl.Status.Admission.PodSetAssignments[1].ResourceUsage = corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("2"),
corev1.ResourceMemory: resource.MustParse("3Gi"),
}
log.Info("[VICENTE] CHANING THE ADMISSION COUNT", "AFTER", wl.Status.Admission)
workload.SyncAdmittedCondition(&wl)
if err := workload.ApplyAdmissionStatus(ctx, r.client, &wl, true); err != nil {
return ctrl.Result{}, err
}
workload.AdjustResources(ctx, r.client, &wl)
}

return r.reconcileNotReadyTimeout(ctx, req, &wl)
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/features/kube_features.go
Expand Up @@ -85,7 +85,7 @@ const (
LendingLimit featuregate.Feature = "LendingLimit"
// owner: @vicenteferrara
// kep: <TODO>
// alpha: v0.7
// alpha: v0.8
DynamicallySizedJobs featuregate.Feature = "DynamicallySizedJobs"
)

Expand All @@ -108,7 +108,7 @@ var defaultFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
PrioritySortingWithinCohort: {Default: true, PreRelease: featuregate.Beta},
MultiKueue: {Default: false, PreRelease: featuregate.Alpha},
LendingLimit: {Default: false, PreRelease: featuregate.Alpha},
DynamicallySizedJobs: {Default: false, PreRelease: featuregate.Alpha},
DynamicallySizedJobs: {Default: true, PreRelease: featuregate.Alpha},
}

func SetFeatureGateDuringTest(tb testing.TB, f featuregate.Feature, value bool) func() {
Expand Down

0 comments on commit 35ca648

Please sign in to comment.