From 286eb56acb907a76c9ad798d7f9b6a3060b52019 Mon Sep 17 00:00:00 2001 From: Shanshan Date: Mon, 20 Nov 2023 13:36:02 +0800 Subject: [PATCH] chore: inject zero resource limit for account jobs (#5867) --- controllers/apps/systemaccount_util.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/controllers/apps/systemaccount_util.go b/controllers/apps/systemaccount_util.go index 2c0247edbc8..80acce6513c 100644 --- a/controllers/apps/systemaccount_util.go +++ b/controllers/apps/systemaccount_util.go @@ -33,6 +33,7 @@ import ( appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1" "github.com/apecloud/kubeblocks/pkg/constant" componetutil "github.com/apecloud/kubeblocks/pkg/controller/component" + intctrlutil "github.com/apecloud/kubeblocks/pkg/controllerutil" viper "github.com/apecloud/kubeblocks/pkg/viperx" ) @@ -139,6 +140,17 @@ func renderJob(jobName string, engine *customizedEngine, key componentUniqueKey, envs = append(envs, engine.getEnvs()...) } + jobContainer := corev1.Container{ + Name: jobName, + Image: engine.getImage(), + ImagePullPolicy: corev1.PullIfNotPresent, + Command: engine.getCommand(), + Args: engine.getArgs(), + Env: envs, + } + + intctrlutil.InjectZeroResourcesLimitsIfEmpty(&jobContainer) + job := &batchv1.Job{ ObjectMeta: metav1.ObjectMeta{ Namespace: key.namespace, @@ -151,16 +163,7 @@ func renderJob(jobName string, engine *customizedEngine, key componentUniqueKey, Name: jobName}, Spec: corev1.PodSpec{ RestartPolicy: corev1.RestartPolicyNever, - Containers: []corev1.Container{ - { - Name: jobName, - Image: engine.getImage(), - ImagePullPolicy: corev1.PullIfNotPresent, - Command: engine.getCommand(), - Args: engine.getArgs(), - Env: envs, - }, - }, + Containers: []corev1.Container{jobContainer}, }, }, },