Add Zuul.Executor.Zone attribute

This change enables configuring an executor zone.

Change-Id: Ida9ec1a9f1d6af2788fa6514c5bb558b89488f64

Author: TristanCacqueray

api/v1/softwarefactory_types.go

@@ -305,6 +305,8 @@ type ZuulExecutorSpec struct {
 	// +kubebuilder:default:=60
 	// +kubebuilder:validation:Minimum:=0
 	AnsibleSetupTimeout int `json:"ansibleSetupTimeout,omitempty"`
+	// The (optional) nodepool [executor-zone](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.zone) setting
+	Zone string `json:"zone,omitempty"`
 	// +kubebuilder:default:=7200
 	// +kubebuilder:validation:Minimum:=1
 	TerminationGracePeriodSeconds int64 `json:"TerminationGracePeriodSeconds,omitempty"`

config/crd/bases/sf.softwarefactory-project.io_softwarefactories.yaml

@@ -677,6 +677,10 @@ spec:
                         required:
                         - size
                         type: object
+                      zone:
+                        description: The (optional) nodepool [executor-zone](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.zone)
+                          setting
+                        type: string
                     type: object
                   gerritconns:
                     description: The list of Gerrit-based connections to add to Zuul's

controllers/zuul.go

@@ -1016,6 +1016,9 @@ func (r *SFController) EnsureZuulConfigSecret(remoteExecutor bool) *ini.File {
 		ansibleSetupTimeout := int(r.cr.Spec.Zuul.Executor.AnsibleSetupTimeout)
 		cfgINI.Section("executor").NewKey("ansible_setup_timeout", strconv.Itoa(ansibleSetupTimeout))
 	}
+	if r.cr.Spec.Zuul.Executor.Zone != "" {
+		cfgINI.Section("executor").NewKey("zone", r.cr.Spec.Zuul.Executor.Zone)
+	}
 
 	// Enable prometheus metrics
 	for _, srv := range []string{"web", "executor", "scheduler", "merger"} {

docs/reference/CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 ## [in development]
 
 ### Added
+
+- Zuul.Executor.Zone setting to configure the nodepool executor-zone.
+
 ### Changed
 ### Deprecated
 ### Removed

docs/reference/api/index.md

@@ -569,6 +569,7 @@ _Appears in:_
 | `limits` _[LimitsSpec](#limitsspec)_ | Memory/CPU Limit | {map[cpu:500m 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}|
 | `ansibleSetupTimeout` _integer_ | the [ansible setup playbook timeout](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.ansible_setup_timeout) | {60}|
+| `zone` _string_ | The (optional) nodepool [executor-zone](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.zone) setting | -|
 | `TerminationGracePeriodSeconds` _integer_ |  | {7200}|
 
 

schemas/ZuulExecutor.dhall

@@ -13,6 +13,7 @@
           , controlPlanePublicZKHostnames : Optional (List Text)
           }
     , storage : Optional (./Storage.dhall).Type
+    , zone : Optional Text
     }
 , default =
   { TerminationGracePeriodSeconds = None Natural
@@ -29,5 +30,6 @@
         , controlPlanePublicZKHostnames : Optional (List Text)
         }
   , storage = None (./Storage.dhall).Type
+  , zone = None Text
   }
 }