Update attributes to camelCase

This change updates the external_config and job_volumes attribute
name to be consistent with kubernetes definitions.

Depends-On: https://review.opendev.org/707190
Change-Id: I168128e543e03935c03ab9547f208f18e432e0fc

conf/zuul/input.dhall

@@ -131,21 +131,21 @@ let Input =
           , launcher : Schemas.Launcher.Type
           , database : Optional UserSecret
           , zookeeper : Optional UserSecret
-          , external_config : Schemas.ExternalConfigs.Type
+          , externalConfig : Schemas.ExternalConfigs.Type
           , connections : Schemas.Connections.Type
-          , job_volumes : Optional (List JobVolume)
+          , jobVolumes : Optional (List JobVolume)
           }
       , default =
           { database = None UserSecret
           , zookeeper = None UserSecret
-          , external_config = Schemas.ExternalConfigs.default
+          , externalConfig = Schemas.ExternalConfigs.default
           , merger = Schemas.Merger.default
           , web = Schemas.Web.default
           , scheduler = Schemas.Scheduler.default
           , executor = Schemas.Executor.default
           , launcher = Schemas.Launcher.default
           , connections = Schemas.Connections.default
-          , job_volumes = None (List JobVolume)
+          , jobVolumes = None (List JobVolume)
           }
       }
 

conf/zuul/resources.dhall

@@ -238,7 +238,7 @@ let {- This method renders the zuul.conf
 
                         in  "${context}_${access}_paths=${job-volume.path}"
                   )
-                  input.job_volumes
+                  input.jobVolumes
 
           in      ''
                   [gearman]
@@ -761,7 +761,7 @@ in      \(input : Input)
                                             (     \(job-volume : JobVolume)
                                               ->  job-volume.volume
                                             )
-                                            input.job_volumes
+                                            input.jobVolumes
 
                                     in  job-volumes
                                 , claim-size = 0
@@ -788,7 +788,7 @@ in      \(input : Input)
                                                     , dir = job-volume.dir
                                                     }
                                               )
-                                              input.job_volumes
+                                              input.jobVolumes
 
                                       in  Some
                                             ( mkVolumeMount
@@ -884,7 +884,7 @@ in      \(input : Input)
                                     }
                                   ]
                           }
-                          input.external_config.openstack
+                          input.externalConfig.openstack
 
                   let kubernetes-config =
                         merge
@@ -897,7 +897,7 @@ in      \(input : Input)
                                     }
                                   ]
                           }
-                          input.external_config.kubernetes
+                          input.externalConfig.kubernetes
 
                   let nodepool-env =
                         mkEnvVarValue
@@ -906,12 +906,12 @@ in      \(input : Input)
                               , OS_CLIENT_CONFIG_FILE =
                                       "/etc/nodepool-openstack/"
                                   ++  DefaultKey
-                                        input.external_config.openstack
+                                        input.externalConfig.openstack
                                         "clouds.yaml"
                               , KUBECONFIG =
                                       "/etc/nodepool-kubernetes/"
                                   ++  DefaultKey
-                                        input.external_config.kubernetes
+                                        input.externalConfig.kubernetes
                                         "kube.config"
                               }
                           )

deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml

@@ -19,7 +19,7 @@ spec:
     gits:
       - baseurl: https://opendev.org
         name: opendev.org
-  external_config:
+  externalConfig:
     kubernetes:
       secretName: nodepool-kube-config
       key: kube.config

playbooks/files/cr_spec.yaml

@@ -20,12 +20,12 @@ connections:
   gits:
     - baseurl: https://opendev.org
       name: opendev.org
-external_config:
+externalConfig:
   kubernetes:
     secretName: nodepool-kube-config
     key: kube.config
 
-job_volumes:
+jobVolumes:
   - context: trusted
     access: ro
     path: /authdaemon/token

playbooks/zuul-operator-functional/run.yaml

@@ -111,7 +111,7 @@
             gits:
               - baseurl: https://opendev.org
                 name: opendev.org
-          external_config:
+          externalConfig:
             kubernetes:
               secretName: nodepool-kube-config
               key: kube.config

playbooks/zuul-operator-functional/test.yaml

@@ -84,11 +84,11 @@
                     name: opendev.org
                   - baseurl: "git://{{ ansible_all_ipv4_addresses[0] }}/"
                     name: local-git
-              external_config:
+              externalConfig:
                 kubernetes:
                   secretName: nodepool-kube-config
                   key: kube.config
-              job_volumes:
+              jobVolumes:
                 - context: trusted
                   access: rw
                   path: /system-dbus/

roles/zuul/tasks/main.yaml

@@ -16,8 +16,8 @@
       web: "{{ raw_spec['web'] | default({}) }}"
       scheduler: "{{ raw_spec['scheduler'] | default({}) }}"
       launcher: "{{ raw_spec['launcher'] | default({}) }}"
-      job_volumes: "{{ raw_spec['job_volumes'] | default([]) }}"
-      external_config: "{{ raw_spec['external_config'] | default({}) }}"
+      jobVolumes: "{{ raw_spec['jobVolumes'] | default([]) }}"
+      externalConfig: "{{ raw_spec['externalConfig'] | default({}) }}"
       connections: "{{ raw_spec['connections'] | default({}) }}"
   register: _cr_input