zuul-scheduler - add hold expiration settings

- zuul-scheduler: add support for `default_hold_expiration`. - zuul-scheduler: add support for `max_hold_expiration`. Change-Id: I540564355bbc8e714c332b5807b6b9e180e573f8
softwarefactory-project · Jul 24, 2024 · 992e6ed · 992e6ed
1 parent 953180c
commit 992e6ed
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 0 deletions.
diff --git a/api/v1/softwarefactory_types.go b/api/v1/softwarefactory_types.go
@@ -296,6 +296,14 @@ type ZuulSchedulerSpec struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={"memory": "2Gi", "cpu": "2000m"}
 	Limits *LimitsSpec `json:"limits"`
+	// the [DefaultHoldExpiration](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-scheduler.default_hold_expiration)
+	// +optional
+	// +kubebuilder:validation:Minimum:=0
+	DefaultHoldExpiration *uint32 `json:"DefaultHoldExpiration,omitempty"`
+	// the [MaxHoldExpiration](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-scheduler.max_hold_expiration)
+	// +optional
+	// +kubebuilder:validation:Minimum:=0
+	MaxHoldExpiration *uint32 `json:"MaxHoldExpiration,omitempty"`
 }
 
 // Zuul Merger Configuration, see [Zuul's documentation](https://zuul-ci.org/docs/zuul/latest/configuration.html#merger)

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/sf.softwarefactory-project.io_softwarefactories.yaml b/config/crd/bases/sf.softwarefactory-project.io_softwarefactories.yaml
@@ -918,6 +918,16 @@ spec:
                   scheduler:
                     description: Configuration of the scheduler microservice
                     properties:
+                      DefaultHoldExpiration:
+                        description: the [DefaultHoldExpiration](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-scheduler.default_hold_expiration)
+                        format: int32
+                        minimum: 0
+                        type: integer
+                      MaxHoldExpiration:
+                        description: the [MaxHoldExpiration](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-scheduler.max_hold_expiration)
+                        format: int32
+                        minimum: 0
+                        type: integer
                       limits:
                         default:
                           cpu: 2000m

diff --git a/controllers/zuul.go b/controllers/zuul.go
@@ -957,6 +957,14 @@ func (r *SFController) EnsureZuulConfigSecret(skipDBSettings bool, skipAuthSetti
 		cfgINI.Section("auth "+*defaultAuthSection).NewKey("default", "true")
 	}
 
+	// Set scheduler settings
+	if r.cr.Spec.Zuul.Scheduler.DefaultHoldExpiration != nil {
+		cfgINI.Section("scheduler").NewKey("default_hold_expiration", strconv.Itoa(int(*r.cr.Spec.Zuul.Scheduler.DefaultHoldExpiration)))
+	}
+	if r.cr.Spec.Zuul.Scheduler.MaxHoldExpiration != nil {
+		cfgINI.Section("scheduler").NewKey("max_hold_expiration", strconv.Itoa(int(*r.cr.Spec.Zuul.Scheduler.MaxHoldExpiration)))
+	}
+
 	// 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,10 @@ All notable changes to this project will be documented in this file.
 ## [in development]
 
 ### Added
+
+- zuul-scheduler: add support for `default_hold_expiration`.
+- zuul-scheduler: add support for `max_hold_expiration`.
+
 ### Changed
 ### Deprecated
 ### Removed

diff --git a/doc/reference/api/index.md b/doc/reference/api/index.md
@@ -540,6 +540,8 @@ _Appears in:_
 | `statsdTarget` _string_ | The address to forward statsd metrics to (optional), in the form "host:port" | -|
 | `logLevel` _[LogLevel](#loglevel)_ | Specify the Log Level of the zuul-scheduler service.<br /><br />Valid values are:<br /><br />"INFO" (default),<br /><br />"WARN",<br /><br />"DEBUG".<br /><br />Changing this value will restart the service. | INFO|
 | `limits` _[LimitsSpec](#limitsspec)_ | Memory/CPU Limit | {map[cpu:2000m memory:2Gi]}|
+| `DefaultHoldExpiration` _integer_ | the [DefaultHoldExpiration](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-scheduler.default_hold_expiration) | -|
+| `MaxHoldExpiration` _integer_ | the [MaxHoldExpiration](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-scheduler.max_hold_expiration) | -|
 
 
 #### ZuulSpec