zuul
/
zuul-operator
Code Issues Proposed changes

Merge "Fix error with multiple nodepool providers"

This commit is contained in:
Zuul 2021-07-30 00:06:31 +00:00 committed by Gerrit Code Review
parent 527031255a 19f80b7d89
commit 4648a32e01
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zuul_operator/templates/nodepool-launcher.yaml
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

4
zuul_operator/zuul.py
View File

@ -304,8 +304,8 @@ class Zuul:
'external_config': self.spec.get('externalConfig', {}),
'spec': self.spec,
}
utils.apply_file(self.api, 'nodepool-launcher.yaml',
namespace=self.namespace, **kw)
utils.apply_file(self.api, 'nodepool-launcher.yaml',
namespace=self.namespace, **kw)
# Get current providers
providers = objects.Deployment.objects(self.api).filter(