Merge "zuul-executor - only update podSpecTemplate to keep configured…

… replicas count"

controllers/zuul.go

@@ -423,7 +423,7 @@ func (r *SFController) EnsureZuulExecutor(cfg *ini.File) bool {
 	if r.GetM("zuul-executor", &current) {
 		if !utils.MapEquals(&current.Spec.Template.ObjectMeta.Annotations, &annotations) {
 			r.log.V(1).Info("zuul-executor configuration changed, rollout zuul-executor pods ...")
-			current.Spec = ze.DeepCopy().Spec
+			current.Spec.Template = *ze.Spec.Template.DeepCopy()
 			r.UpdateR(&current)
 			return false
 		}

roles/health-check/zuul-components/tasks/main.yaml

@@ -28,10 +28,10 @@
   failed_when: "'running' not in item.state"
   loop: "{{ _components.json['scheduler'] }}"
 
-- name: Check if, at least, one Zuul Executor Instance Exists, fails otherwise
+- name: Check if, two Zuul Executor Instances Exist, fails otherwise
   ansible.builtin.fail:
-    msg: "Zuul Executor has no instances"
-  when: "_components.json['executor'] | length  == 0"
+    msg: "Zuul Executor must have 2 replicas"
+  when: "_components.json['executor'] | length != 2"
 
 - name: Check if Zuul Executor Instances are Running
   ansible.builtin.fail:

roles/run-tests/tasks/main.yaml

@@ -34,7 +34,7 @@
     - name: test-cert-manager-letsencrypt
       when: "{{ mode == 'olm' }}"
     - name: zuul-client-api
-    - name: zuul-components
     - name: test-monitoring
+    - name: zuul-components
   loop_control:
     loop_var: role