Merge "Helm-Tests: Target pods by node-labels"

2018-02-20 15:28:43 +00:00 · 2018-02-20 15:28:43 +00:00 · 9bbd48362f
commit 9bbd48362f
parent e4313c86c7 f19f0873f0
17 changed files with 129 additions and 46 deletions
--- 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 }}
--- 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

--- 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 }}
--- 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:
--- 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 }}
--- 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
--- 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:
--- 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

--- 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:
--- 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

--- 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:
--- 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:
--- 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:
--- 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

--- 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:
--- 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
--- 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}