Skip to content

[DO NOT MERGE] update defaults in cgroups conf #2060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
itechdima wants to merge 5 commits into
base: soperator-release-1.23
Choose a base branch
from
Draft

[DO NOT MERGE] update defaults in cgroups conf #2060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab8f14d
update defaults in cgroups conf
itechdima Jan 20, 2026
a6cad0f
increase liveness probe timeouts
itechdima Mar 24, 2026
dada406
increase liveness probe
itechdima Mar 30, 2026
d7e12ba
one more fix
Uburro Apr 14, 2026
25e818b
fix
Uburro Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions internal/render/common/configmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions internal/render/common/configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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`
Expand Down
6 changes: 3 additions & 3 deletions internal/render/controller/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading