Move the executor zone to the standalone definition

This change fixes the zone configuration to remote executor
because it does not make sense to have it defined for executor
running in the main control plane.

Change-Id: I7d65d7843315a8970314a77494dc2b599e38539b

Author: TristanCacqueray

api/v1/softwarefactory_types.go

@@ -272,6 +272,8 @@ type StandaloneZuulExecutorSpec struct {
 	ControlPlanePublicGSHostname string `json:"controlPlanePublicGSHostname"`
 	// This is the public host or IP address reachable from zuul-web
 	PublicHostName string `json:"publicHostname"`
+	// The (optional) nodepool [executor-zone](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.zone) setting
+	Zone string `json:"zone,omitempty"`
 }
 
 // Spec for the pool of executor microservices
@@ -305,8 +307,6 @@ 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

@@ -652,6 +652,10 @@ spec:
                             description: This is the public host or IP address reachable
                               from zuul-web
                             type: string
+                          zone:
+                            description: The (optional) nodepool [executor-zone](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.zone)
+                              setting
+                            type: string
                         required:
                         - controlPlanePublicGSHostname
                         - controlPlanePublicZKHostname
@@ -677,10 +681,6 @@ 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,8 +1016,8 @@ 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)
+	if r.cr.Spec.Zuul.Executor.Standalone != nil && r.cr.Spec.Zuul.Executor.Standalone.Zone != "" {
+		cfgINI.Section("executor").NewKey("zone", r.cr.Spec.Zuul.Executor.Standalone.Zone)
 	}
 
 	// Enable prometheus metrics

docs/reference/CHANGELOG.md

@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- Zuul.Executor.Zone setting to configure the nodepool executor-zone.
+- Zuul.Executor.Standalone.Zone setting to configure the nodepool executor-zone.
 
 ### Changed
 ### Deprecated

docs/reference/api/index.md

@@ -495,6 +495,7 @@ _Appears in:_
 | `controlPlanePublicZKHostnames` _string_ | This is the public hostnames or IPs where control plane's Zookeepers can be reached | -|
 | `controlPlanePublicGSHostname` _string_ | This is the public hostname or IP where control plane's GitServer can be reached | -|
 | `publicHostname` _string_ | This is the public host or IP address reachable from zuul-web | -|
+| `zone` _string_ | The (optional) nodepool [executor-zone](https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.zone) setting | -|
 
 
 #### StorageDefaultSpec
@@ -569,7 +570,6 @@ _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

@@ -11,9 +11,9 @@
           , controlPlanePublicZKHostname : Text
           , publicHostname : Text
           , controlPlanePublicZKHostnames : Optional (List Text)
+          , zone : Optional Text
           }
     , storage : Optional (./Storage.dhall).Type
-    , zone : Optional Text
     }
 , default =
   { TerminationGracePeriodSeconds = None Natural
@@ -28,8 +28,8 @@
         , controlPlanePublicZKHostname : Text
         , publicHostname : Text
         , controlPlanePublicZKHostnames : Optional (List Text)
+        , zone : Optional Text
         }
   , storage = None (./Storage.dhall).Type
-  , zone = None Text
   }
 }