diff --git a/Makefile b/Makefile index 69e678c83..d5271d97e 100644 --- a/Makefile +++ b/Makefile @@ -593,7 +593,7 @@ $(CONTROLLER_GEN): $(LOCALBIN) .PHONY: envtest envtest: $(ENVTEST) ## Download setup-envtest locally if necessary. $(ENVTEST): $(LOCALBIN) - test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest + test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.22 .PHONY: golangci-lint golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary. diff --git a/internal/render/common/configmap.go b/internal/render/common/configmap.go index ba04e4492..0ac6acdb3 100644 --- a/internal/render/common/configmap.go +++ b/internal/render/common/configmap.go @@ -361,8 +361,8 @@ func addSlurmConfigProperties(res *renderutils.PropertiesConfig, config interfac func generateCGroupConfig(cluster *values.SlurmCluster) renderutils.ConfigFile { res := &renderutils.PropertiesConfig{} res.AddProperty("CgroupMountpoint", "/sys/fs/cgroup") - res.AddProperty("ConstrainCores", "yes") - res.AddProperty("ConstrainDevices", "yes") + res.AddProperty("ConstrainCores", "no") + res.AddProperty("ConstrainDevices", "no") res.AddProperty("ConstrainRAMSpace", "yes") switch cluster.NodeWorker.CgroupVersion { case consts.CGroupV1: diff --git a/internal/render/common/configmap_test.go b/internal/render/common/configmap_test.go index cdaec8174..140e96fc2 100644 --- a/internal/render/common/configmap_test.go +++ b/internal/render/common/configmap_test.go @@ -27,8 +27,8 @@ func Test_GenerateCGroupConfig(t *testing.T) { } resV2 := generateCGroupConfig(clusterV2) expectedV2 := `CgroupMountpoint=/sys/fs/cgroup -ConstrainCores=yes -ConstrainDevices=yes +ConstrainCores=no +ConstrainDevices=no ConstrainRAMSpace=yes CgroupPlugin=cgroup/v2 ConstrainSwapSpace=no @@ -41,8 +41,8 @@ IgnoreSystemd=yes` }, } expectedV1 := `CgroupMountpoint=/sys/fs/cgroup -ConstrainCores=yes -ConstrainDevices=yes +ConstrainCores=no +ConstrainDevices=no ConstrainRAMSpace=yes CgroupPlugin=cgroup/v1 ConstrainSwapSpace=yes` diff --git a/internal/render/controller/container.go b/internal/render/controller/container.go index a7318d104..5b99fbd10 100644 --- a/internal/render/controller/container.go +++ b/internal/render/controller/container.go @@ -54,10 +54,10 @@ func renderContainerSlurmctld(container *values.Container, customMounts []slurmv }, }, InitialDelaySeconds: common.DefaultProbeInitialDelaySeconds, - TimeoutSeconds: common.DefaultProbeTimeoutSeconds, - PeriodSeconds: common.DefaultProbePeriodSeconds, + TimeoutSeconds: 60, + PeriodSeconds: 70, SuccessThreshold: common.DefaultProbeSuccessThreshold, - FailureThreshold: common.DefaultProbeFailureThreshold, + FailureThreshold: 5, }, TerminationMessagePath: corev1.TerminationMessagePathDefault, TerminationMessagePolicy: corev1.TerminationMessageReadFile,