Fix error with multiple nodepool providers

An indentation error caused the operator to only create the last
provider listed in the nodepool config.

Additionally, add the nodepool provider to the nodepool launcher
deployment spec.

This is needed to separate the pods for different nodepool launchers
(otherwise, the deployments may consider pods for one launcher to
belong to another).

Change-Id: I76bbae948d1a633028b3565d512fb48d68111dd7
This commit is contained in:
James E. Blair 2021-07-07 10:30:24 -07:00
parent 9f2f4ec145
commit 19f80b7d89
2 changed files with 4 additions and 2 deletions

View File

@ -17,6 +17,7 @@ spec:
app.kubernetes.io/instance: {{ instance_name }}
app.kubernetes.io/part-of: zuul
app.kubernetes.io/component: nodepool-launcher
operator.zuul-ci.org/nodepool-provider: {{ provider_name }}
template:
metadata:
labels:
@ -24,6 +25,7 @@ spec:
app.kubernetes.io/instance: {{ instance_name }}
app.kubernetes.io/part-of: zuul
app.kubernetes.io/component: nodepool-launcher
operator.zuul-ci.org/nodepool-provider: {{ provider_name }}
spec:
containers:
- name: launcher