diff options
| author |   Rex Lee <limingjiang@huawei.com> | 2017-09-26 08:19:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-26 08:19:13 +0000 |
| commit | ceb2bd1a0a3266d3bb72adbbf5ddad8ec86e3128 (patch) | |
| tree | caadf2930e25984c859a56815f09ab90645b2f3d /yardstick/orchestrator | |
| parent | 9ea225f671b774c6e373dbaab146d68cac16194e (diff) | |
| parent | 0f4cf413a3c527ddf2eab3d724ae758e39af1aa0 (diff) | |
Merge "Add nodeSelector to enable selecting the desired Kubernetes running node when creating containers for Kubernetes context"
Diffstat (limited to 'yardstick/orchestrator')
| -rw-r--r-- | yardstick/orchestrator/kubernetes.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/yardstick/orchestrator/kubernetes.py b/yardstick/orchestrator/kubernetes.py index 9f94fd4ff..198eeac6d 100644 --- a/yardstick/orchestrator/kubernetes.py +++ b/yardstick/orchestrator/kubernetes.py @@ -23,6 +23,7 @@ class KubernetesObject(object): self.command = [kwargs.get('command', '/bin/bash')] self.args = kwargs.get('args', []) self.ssh_key = kwargs.get('ssh_key', 'yardstick_key') + self.node_selector = kwargs.get('nodeSelector', {}) self.volumes = [] @@ -42,7 +43,8 @@ class KubernetesObject(object): }, "spec": { "containers": [], - "volumes": [] + "volumes": [], + "nodeSelector": {} } } } @@ -50,6 +52,7 @@ class KubernetesObject(object): self._change_value_according_name(name) self._add_containers() + self._add_node_selector() self._add_ssh_key_volume() self._add_volumes() @@ -88,6 +91,11 @@ class KubernetesObject(object): return container + def _add_node_selector(self): + utils.set_dict_value(self.template, + 'spec.template.spec.nodeSelector', + self.node_selector) + def _add_volumes(self): utils.set_dict_value(self.template, 'spec.template.spec.volumes', |