feat: add ability to set shm-size property

This doesn't yet manage process volumes, but the scaffolding is there to allow interacting with the property.
This commit is contained in:
Jose Diaz-Gonzalez committed 2025-03-06 22:48:49 -05:00
1 parent 52c05558f9
commit 888d1d4bf3
4 files changed
+41 -6

No files matched your search

+7 -6
View File
@@ -138,12 +138,13 @@ dokku scheduler-k3s:set --global network-interface eth1
The k3s plugin provides a number of settings that can be used to managed deployments on a per-app basis. The following table outlines ones not covered elsewhere: The k3s plugin provides a number of settings that can be used to managed deployments on a per-app basis. The following table outlines ones not covered elsewhere:
| Name | Description | Global Default | | Name | Description | Global Default |
|---------------------|---------------------------------------------------|----------------| |-----------------------|---------------------------------------------------|--------------------|
| deploy-timeout | Controls when app deploys will timeout in seconds | 300s | | `deploy-timeout` | Controls when app deploys will timeout in seconds | `300s` |
| namespace | Controls the namespace used for resource creation | default | | `image-pull-secrets` | Name of a kubernetes secret used to auth against a registry | Contents of `~/.docker/config.json` from Dokku server |
| rollback-on-failure | Whether to rollback failed deploys | false | | `namespace` | Controls the namespace used for resource creation | `default` |
| image-pull-secrets | Name of a kubernetes secret used to auth against a registry | Contents of `~/.docker/config.json` from Dokku server | | `rollback-on-failure` | Whether to rollback failed deploys | `false` |
| `shm-size` | Default shared memory size for pods | Kubernetes default |
All settings can be set via the `scheduler-k3s:set` command. Using `deploy-timeout` as an example: All settings can be set via the `scheduler-k3s:set` command. Using `deploy-timeout` as an example:
+17
View File
@@ -1227,6 +1227,23 @@ func getComputedRollbackOnFailure(appName string) string {
return rollbackOnFailure return rollbackOnFailure
} }
func getShmSize(appName string) string {
return common.PropertyGetDefault("scheduler-k3s", appName, "shm-size", "")
}
func getGlobalShmSize() string {
return common.PropertyGetDefault("scheduler-k3s", "--global", "shm-size", "")
}
func getComputedShmSize(appName string) string {
shmSize := getShmSize(appName)
if shmSize == "" {
shmSize = getGlobalShmSize()
}
return shmSize
}
func getGlobalGlobalToken() string { func getGlobalGlobalToken() string {
return common.PropertyGet("scheduler-k3s", "--global", "token") return common.PropertyGet("scheduler-k3s", "--global", "token")
} }
+15
View File
@@ -35,6 +35,9 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
"--scheduler-k3s-computed-rollback-on-failure": reportComputedRollbackOnFailure, "--scheduler-k3s-computed-rollback-on-failure": reportComputedRollbackOnFailure,
"--scheduler-k3s-rollback-on-failure": reportRollbackOnFailure, "--scheduler-k3s-rollback-on-failure": reportRollbackOnFailure,
"--scheduler-k3s-global-rollback-on-failure": reportGlobalRollbackOnFailure, "--scheduler-k3s-global-rollback-on-failure": reportGlobalRollbackOnFailure,
"--scheduler-k3s-computed-shm-size": reportComputedShmSize,
"--scheduler-k3s-global-shm-size": reportGlobalShmSize,
"--scheduler-k3s-shm-size": reportShmSize,
} }
chartProperties, err := common.PropertyGetAllByPrefix("scheduler-k3s", "--global", "chart.") chartProperties, err := common.PropertyGetAllByPrefix("scheduler-k3s", "--global", "chart.")
@@ -172,3 +175,15 @@ func reportRollbackOnFailure(appName string) string {
func reportGlobalRollbackOnFailure(appName string) string { func reportGlobalRollbackOnFailure(appName string) string {
return getGlobalRollbackOnFailure() return getGlobalRollbackOnFailure()
} }
func reportComputedShmSize(appName string) string {
return getComputedShmSize(appName)
}
func reportGlobalShmSize(appName string) string {
return getGlobalShmSize()
}
func reportShmSize(appName string) string {
return getShmSize(appName)
}
+2
View File
@@ -23,6 +23,7 @@ var (
"image-pull-secrets": "", "image-pull-secrets": "",
"namespace": "", "namespace": "",
"rollback-on-failure": "", "rollback-on-failure": "",
"shm-size": "",
} }
// GlobalProperties is a map of all valid global k3s properties // GlobalProperties is a map of all valid global k3s properties
@@ -38,6 +39,7 @@ var (
"namespace": true, "namespace": true,
"network-interface": true, "network-interface": true,
"rollback-on-failure": true, "rollback-on-failure": true,
"shm-size": true,
"token": true, "token": true,
} }
) )