crd/zuul-executor - support for disk_limit_per_job

Change-Id: Ic0c343001ebd949a1c595e7a9dd4e8f67d8d4178
softwarefactory-project · Sep 20, 2024 · 297fce2 · 297fce2
1 parent f3c0584
commit 297fce2
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/api/v1/softwarefactory_types.go b/api/v1/softwarefactory_types.go
@@ -292,6 +292,10 @@ type ZuulExecutorSpec struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={"memory": "2Gi", "cpu": "2000m"}
 	Limits *LimitsSpec `json:"limits"`
+	// the [disk_limit_per_job](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.disk_limit_per_job)
+	// +kubebuilder:default:=250
+	// +kubebuilder:validation:Minimum:=-1
+	DiskLimitPerJob int `json:"diskLimitPerJob,omitempty"`
 }
 
 type ZuulWebSpec struct {

diff --git a/config/crd/bases/sf.softwarefactory-project.io_softwarefactories.yaml b/config/crd/bases/sf.softwarefactory-project.io_softwarefactories.yaml
@@ -474,6 +474,11 @@ spec:
                   executor:
                     description: Configuration of the executor microservices
                     properties:
+                      diskLimitPerJob:
+                        default: 250
+                        description: the [disk_limit_per_job](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.disk_limit_per_job)
+                        minimum: -1
+                        type: integer
                       enabled:
                         default: true
                         description: If set to false, the zuul-executor deployment

diff --git a/controllers/zuul.go b/controllers/zuul.go
@@ -995,6 +995,15 @@ func (r *SFController) EnsureZuulConfigSecret(skipDBSettings bool, skipAuthSetti
 		cfgINI.Section("scheduler").NewKey("max_hold_expiration", strconv.Itoa(int(*r.cr.Spec.Zuul.Scheduler.MaxHoldExpiration)))
 	}
 
+	// Set executor settings
+	if r.cr.Spec.Zuul.Executor.DiskLimitPerJob != 0 {
+		size := int(r.cr.Spec.Zuul.Executor.DiskLimitPerJob)
+		if size < -1 {
+			size = -1
+		}
+		cfgINI.Section("executor").NewKey("disk_limit_per_job", strconv.Itoa(size))
+	}
+
 	// Enable prometheus metrics
 	for _, srv := range []string{"web", "executor", "scheduler", "merger"} {
 		cfgINI.Section(srv).NewKey("prometheus_port", strconv.Itoa(zuulPrometheusPort))

diff --git a/doc/reference/CHANGELOG.md b/doc/reference/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 ## [in development]
 
 ### Added
+### Removed
+### Changed
+### Fixed
+### Security
+
+## [v0.0.43] - 2024-09-20
+
+### Added
+
+- crd/zuul-executor - support for disk_limit_per_job
+
 ### Removed
 ### Changed
 

diff --git a/doc/reference/api/index.md b/doc/reference/api/index.md
@@ -517,6 +517,7 @@ _Appears in:_
 | `enabled` _boolean_ | If set to false, the zuul-executor deployment won't be applied | {true}|
 | `standalone` _[StandaloneZuulExecutorSpec](#standalonezuulexecutorspec)_ | When set the Control plane is not deployed.<br /><br />The standalone executor must be able to connect to the control plane | -|
 | `limits` _[LimitsSpec](#limitsspec)_ | Memory/CPU Limit | {map[cpu:2000m memory:2Gi]}|
+| `diskLimitPerJob` _integer_ | the [disk_limit_per_job](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.disk_limit_per_job) | {250}|
 
 
 #### ZuulMergerSpec