From f19f0873f0b2b214570455000f63b80a6349b0eb Mon Sep 17 00:00:00 2001 From: portdirect Date: Mon, 19 Feb 2018 12:13:54 -0500 Subject: [PATCH] Helm-Tests: Target pods by node-labels Change-Id: Ie71ef58fb7eb530fd49512e10d7666ec08d99609 --- barbican/templates/pod-test.yaml | 2 + barbican/values.yaml | 3 + ceilometer/templates/pod-rally-test.yaml | 2 + ceilometer/values.yaml | 3 + cinder/templates/pod-rally-test.yaml | 2 + cinder/values.yaml | 3 + congress/templates/pod-test.yaml | 2 + congress/values.yaml | 3 + glance/templates/pod-rally-test.yaml | 2 + glance/values.yaml | 3 + gnocchi/templates/pod-gnocchi-test.yaml | 2 + gnocchi/values.yaml | 3 + neutron/templates/pod-rally-test.yaml | 2 + neutron/values.yaml | 25 +++--- nova/templates/pod-rally-test.yaml | 2 + nova/values.yaml | 27 +++--- .../armada/multinode/armada-osh.yaml | 89 ++++++++++++++----- 17 files changed, 129 insertions(+), 46 deletions(-) diff --git a/barbican/templates/pod-test.yaml b/barbican/templates/pod-test.yaml index 56ec35dbd6..b31a089439 100644 --- a/barbican/templates/pod-test.yaml +++ b/barbican/templates/pod-test.yaml @@ -32,6 +32,8 @@ metadata: "helm.sh/hook": test-success spec: serviceAccountName: {{ $serviceAccountName }} + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} restartPolicy: Never initContainers: {{ tuple $envAll $dependencies $mounts_barbican_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/barbican/values.yaml b/barbican/values.yaml index fb793ba324..a36ce3aa7a 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -17,6 +17,9 @@ labels: job: node_selector_key: openstack-control-plane node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled release_group: null diff --git a/ceilometer/templates/pod-rally-test.yaml b/ceilometer/templates/pod-rally-test.yaml index fc08df77db..dc5d04ebaf 100644 --- a/ceilometer/templates/pod-rally-test.yaml +++ b/ceilometer/templates/pod-rally-test.yaml @@ -32,6 +32,8 @@ metadata: "helm.sh/hook": test-success spec: restartPolicy: Never + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} serviceAccountName: {{ $serviceAccountName }} initContainers: {{ tuple $envAll $dependencies $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 4e9b883dc3..3f84cfa0f8 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -36,6 +36,9 @@ labels: job: node_selector_key: openstack-control-plane node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled images: tags: diff --git a/cinder/templates/pod-rally-test.yaml b/cinder/templates/pod-rally-test.yaml index d3223a72a6..57efada5e5 100644 --- a/cinder/templates/pod-rally-test.yaml +++ b/cinder/templates/pod-rally-test.yaml @@ -32,6 +32,8 @@ metadata: "helm.sh/hook": test-success spec: restartPolicy: Never + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} serviceAccountName: {{ $serviceAccountName }} initContainers: {{ tuple $envAll $dependencies $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} diff --git a/cinder/values.yaml b/cinder/values.yaml index 0128827635..8c8d2817e5 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -32,6 +32,9 @@ labels: scheduler: node_selector_key: openstack-control-plane node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled volume: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/congress/templates/pod-test.yaml b/congress/templates/pod-test.yaml index 19e96e15e4..668882bd07 100644 --- a/congress/templates/pod-test.yaml +++ b/congress/templates/pod-test.yaml @@ -27,6 +27,8 @@ metadata: annotations: "helm.sh/hook": test-success spec: + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} serviceAccountName: {{ $serviceAccountName }} restartPolicy: Never containers: diff --git a/congress/values.yaml b/congress/values.yaml index 7ad70f96f0..1352448315 100644 --- a/congress/values.yaml +++ b/congress/values.yaml @@ -27,6 +27,9 @@ labels: policy_engine: node_selector_key: openstack-control-plane node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled release_group: null diff --git a/glance/templates/pod-rally-test.yaml b/glance/templates/pod-rally-test.yaml index 340a1dc0e0..8ca0cd62a0 100644 --- a/glance/templates/pod-rally-test.yaml +++ b/glance/templates/pod-rally-test.yaml @@ -31,6 +31,8 @@ metadata: annotations: "helm.sh/hook": test-success spec: + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} restartPolicy: Never serviceAccountName: {{ $serviceAccountName }} initContainers: diff --git a/glance/values.yaml b/glance/values.yaml index 2c5d24840c..4a7ad618d8 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -30,6 +30,9 @@ labels: registry: node_selector_key: openstack-control-plane node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled release_group: null diff --git a/gnocchi/templates/pod-gnocchi-test.yaml b/gnocchi/templates/pod-gnocchi-test.yaml index 4a44230fba..f0f34b2f2d 100644 --- a/gnocchi/templates/pod-gnocchi-test.yaml +++ b/gnocchi/templates/pod-gnocchi-test.yaml @@ -31,6 +31,8 @@ metadata: annotations: "helm.sh/hook": test-success spec: + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} serviceAccountName: {{ $serviceAccountName }} restartPolicy: Never initContainers: diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index 41734327ff..a79f18a9a5 100644 --- a/gnocchi/values.yaml +++ b/gnocchi/values.yaml @@ -15,6 +15,9 @@ labels: statsd: node_selector_key: openstack-control-plane node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled images: tags: diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml index 493859f792..c027bb9e61 100644 --- a/neutron/templates/pod-rally-test.yaml +++ b/neutron/templates/pod-rally-test.yaml @@ -31,6 +31,8 @@ metadata: annotations: "helm.sh/hook": test-success spec: + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} restartPolicy: Never serviceAccountName: {{ $serviceAccountName }} initContainers: diff --git a/neutron/values.yaml b/neutron/values.yaml index 6089c49bec..205cefc6cd 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -39,16 +39,6 @@ images: pull_policy: "IfNotPresent" labels: - # ovs is a special case, requiring a special - # label that can apply to both control hosts - # and compute hosts, until we get more sophisticated - # with our daemonset scheduling - ovs: - node_selector_key: openvswitch - node_selector_value: enabled - lb: - node_selector_key: linuxbridge - node_selector_value: enabled agent: dhcp: node_selector_key: openstack-control-plane @@ -59,10 +49,23 @@ labels: metadata: node_selector_key: openstack-control-plane node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled + lb: + node_selector_key: linuxbridge + node_selector_value: enabled + # ovs is a special case, requiring a special + # label that can apply to both control hosts + # and compute hosts, until we get more sophisticated + # with our daemonset scheduling + ovs: + node_selector_key: openvswitch + node_selector_value: enabled server: node_selector_key: openstack-control-plane node_selector_value: enabled - job: + test: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/nova/templates/pod-rally-test.yaml b/nova/templates/pod-rally-test.yaml index 80a87f5d31..70ea1206fb 100644 --- a/nova/templates/pod-rally-test.yaml +++ b/nova/templates/pod-rally-test.yaml @@ -31,6 +31,8 @@ metadata: annotations: "helm.sh/hook": test-success spec: + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} restartPolicy: Never serviceAccountName: {{ $serviceAccountName }} initContainers: diff --git a/nova/values.yaml b/nova/values.yaml index 420c2d49c2..805f1ee173 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -27,33 +27,36 @@ labels: compute_ironic: node_selector_key: openstack-compute-node node_selector_value: enabled + api_metadata: + node_selector_key: openstack-control-plane + node_selector_value: enabled conductor: node_selector_key: openstack-control-plane node_selector_value: enabled consoleauth: node_selector_key: openstack-control-plane node_selector_value: enabled - scheduler: - node_selector_key: openstack-control-plane - node_selector_value: enabled - osapi: - node_selector_key: openstack-control-plane - node_selector_value: enabled - api_metadata: - node_selector_key: openstack-control-plane - node_selector_value: enabled - placement: - node_selector_key: openstack-control-plane - node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled novncproxy: node_selector_key: openstack-control-plane node_selector_value: enabled + osapi: + node_selector_key: openstack-control-plane + node_selector_value: enabled + placement: + node_selector_key: openstack-control-plane + node_selector_value: enabled + scheduler: + node_selector_key: openstack-control-plane + node_selector_value: enabled spiceproxy: node_selector_key: openstack-control-plane node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled images: pull_policy: IfNotPresent diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml index 7b7198c5ce..376f1e4dba 100644 --- a/tools/deployment/armada/multinode/armada-osh.yaml +++ b/tools/deployment/armada/multinode/armada-osh.yaml @@ -406,7 +406,16 @@ data: hosts: default: glance-memcached labels: - server: + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled + registry: + node_selector_key: openstack-control-plane + node_selector_value: enabled + test: node_selector_key: openstack-control-plane node_selector_value: enabled source: @@ -565,7 +574,22 @@ data: hosts: default: cinder-memcached labels: - server: + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + backup: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled + scheduler: + node_selector_key: openstack-control-plane + node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled + volume: node_selector_key: openstack-control-plane node_selector_value: enabled source: @@ -939,33 +963,39 @@ data: compute: node_selector_key: openstack-compute-node node_selector_value: enabled + compute_ironic: + node_selector_key: openstack-compute-node + node_selector_value: enabled + api_metadata: + node_selector_key: openstack-control-plane + node_selector_value: enabled conductor: node_selector_key: openstack-control-plane node_selector_value: enabled consoleauth: node_selector_key: openstack-control-plane node_selector_value: enabled - scheduler: - node_selector_key: openstack-control-plane - node_selector_value: enabled - osapi: - node_selector_key: openstack-control-plane - node_selector_value: enabled - api_metadata: - node_selector_key: openstack-control-plane - node_selector_value: enabled - placement: - node_selector_key: openstack-control-plane - node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled novncproxy: node_selector_key: openstack-control-plane node_selector_value: enabled + osapi: + node_selector_key: openstack-control-plane + node_selector_value: enabled + placement: + node_selector_key: openstack-control-plane + node_selector_value: enabled + scheduler: + node_selector_key: openstack-control-plane + node_selector_value: enabled spiceproxy: node_selector_key: openstack-control-plane node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled pod: replicas: api_metadata: 1 @@ -1125,15 +1155,6 @@ data: replicas: server: 2 labels: - ovs: - node_selector_key: openvswitch - node_selector_value: enabled - lb: - node_selector_key: linuxbridge - node_selector_value: enabled - server: - node_selector_key: openstack-control-plane - node_selector_value: enabled agent: dhcp: node_selector_key: openstack-control-plane @@ -1144,6 +1165,25 @@ data: metadata: node_selector_key: openstack-control-plane node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled + lb: + node_selector_key: linuxbridge + node_selector_value: enabled + # ovs is a special case, requiring a special + # label that can apply to both control hosts + # and compute hosts, until we get more sophisticated + # with our daemonset scheduling + ovs: + node_selector_key: openvswitch + node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled network: interface: tunnel: $tunnel_device @@ -1360,6 +1400,9 @@ data: server: node_selector_key: openstack-control-plane node_selector_value: enabled + test: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH}