zuul
/
zuul-operator
Code Issues Proposed changes

Add nodepool external config 

This change mounts optional openstack and kubernetes external config
inside the nodepool launcher deployment.

Change-Id: I2bc657e073f381caba64b6d286f22c2c6d8e26ed
This commit is contained in:
Tristan Cacqueray 2020-03-26 21:13:28 +00:00
parent a6739d3cad
commit 62559c274d
1 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
conf/zuul/resources.dhall
View File

@ -790,7 +790,53 @@ in \(input : Input)
, dir = "/etc/nodepool-config"
}
let nodepool-volumes = [ etc-nodepool, nodepool-config ]
let openstack-config =
merge
{ None = [] : List Volume.Type
, Some =
\(some : UserSecret)
-> [ Volume::{
, name = some.secretName
, dir = "/etc/nodepool-openstack"
}
]
}
input.external_config.openstack
let kubernetes-config =
merge
{ None = [] : List Volume.Type
, Some =
\(some : UserSecret)
-> [ Volume::{
, name = some.secretName
, dir = "/etc/nodepool-kubernetes"
}
]
}
input.external_config.kubernetes
let nodepool-env =
mkEnvVarValue
( toMap
{ HOME = "/var/lib/nodepool"
, OS_CLIENT_CONFIG_FILE =
"/etc/nodepool-openstack/"
++ DefaultKey
input.external_config.openstack
"clouds.yaml"
, KUBECONFIG =
"/etc/nodepool-kubernetes/"
++ DefaultKey
input.external_config.kubernetes
"kube.config"
}
)
let nodepool-volumes =
[ etc-nodepool, nodepool-config ]
# openstack-config
# kubernetes-config
let shard-config =
"cat /etc/nodepool/nodepool.yaml /etc/nodepool-config/*.yaml > /var/lib/nodepool/config.yaml; "
@ -813,6 +859,7 @@ in \(input : Input)
++ "nodepool-launcher -d -c /var/lib/nodepool/config.yaml"
]
, imagePullPolicy = Some "IfNotPresent"
, env = nodepool-env
, volumeMounts =
mkVolumeMount
(nodepool-volumes # nodepool-data-dir)