Fixed issue att-comdev#207 by updating label's key and value for open…

…stack-control-plane in following:docs, glance, rabbitmq, postgresql, memcached, mariadb, maas, keystone, horizon, heat, etcd, cinder and neutron
renmak · Mar 15, 2017 · 2ce3100 · 2ce3100
1 parent 3e62cd5
commit 2ce3100
Show file tree

Hide file tree

Showing 54 changed files with 82 additions and 82 deletions.
diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml
@@ -40,7 +40,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: cinder-api
           image: {{ .Values.images.api }}

diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml
@@ -40,7 +40,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: cinder-scheduler
           image: {{ .Values.images.scheduler }}

diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml
@@ -40,7 +40,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: cinder-volume
           image: {{ .Values.images.volume }}

diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: cinder-db-init
           image: {{ .Values.images.db_init | quote }}

diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml
@@ -27,8 +27,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
-      nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      nodeSelector: 
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: cinder-db-sync
           image: {{ .Values.images.db_sync }}

diff --git a/cinder/templates/job-ks-endpoints.yaml b/cinder/templates/job-ks-endpoints.yaml
@@ -29,7 +29,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
 {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}

diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml
@@ -29,7 +29,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
 {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }}
         - name: {{ $osServiceType }}-ks-service-registration

diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml
@@ -30,7 +30,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: cinder-ks-user
           image: {{ .Values.images.ks_user }}

diff --git a/cinder/values.yaml b/cinder/values.yaml
@@ -23,8 +23,8 @@ replicas:
   scheduler: 1
 
 labels:
-  node_selector_key: openstack-control-plane
-  node_selector_value: enabled
+  control_node_selector_key: openstack-control-plane
+  control_node_selector_value: enabled
 
 images:
   dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0

diff --git a/docs/helm_overrides.md b/docs/helm_overrides.md
@@ -48,8 +48,8 @@ Labels are of course definable and overridable by the chart operators. Labels ar
 
 ```
 labels:
-  node_selector_key: openstack-control-plane
-  node_selector_value: enabled
+  control_node_selector_key: openstack-control-plane
+  control_node_selector_value: enabled
 ```
 
 In some cases, such as with the Neutron chart, a chart may need to define more then one label. In cases such as this, each element should be articulated under the `labels:` section, nesting where appropriate:
@@ -65,17 +65,17 @@ labels:
       node_selector_value: enabled
   agent:
     dhcp:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
+      control_node_selector_key: openstack-control-plane
+      control_node_selector_value: enabled
     l3:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
+      control_node_selector_key: openstack-control-plane
+      control_node_selector_value: enabled
     metadata:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
+      control_node_selector_key: openstack-control-plane
+      control_node_selector_value: enabled
   server:
-    node_selector_key: openstack-control-plane
-    node_selector_value: enabled
+    control_node_selector_key: openstack-control-plane
+    control_node_selector_value: enabled
 ```
 
 These labels should be leveraged by `nodeSelector` definitions in charts for all resources, including jobs:

diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml
@@ -18,7 +18,7 @@ spec:
         app: etcd
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: etcd
           image: {{ .Values.images.etcd }}

diff --git a/etcd/values.yaml b/etcd/values.yaml
@@ -10,8 +10,8 @@ upgrades:
     max_surge: 3
 
 labels:
-  node_selector_key: openstack-control-plane
-  node_selector_value: enabled
+  control_node_selector_key: openstack-control-plane
+  control_node_selector_value: enabled
 
 network:
   port: 2379

diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml
@@ -44,7 +44,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: glance-api
           image: {{ .Values.images.api }}

diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml
@@ -36,7 +36,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: glance-registry
           image: {{ .Values.images.registry }}

diff --git a/glance/templates/job-db-init.yaml b/glance/templates/job-db-init.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: glance-db-init
           image: {{ .Values.images.db_init }}

diff --git a/glance/templates/job-db-sync.yaml b/glance/templates/job-db-sync.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: glance-db-sync
           image: {{ .Values.images.db_sync }}

diff --git a/glance/templates/job-post.yaml b/glance/templates/job-post.yaml
@@ -27,7 +27,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       restartPolicy: OnFailure
       containers:
         - name: glance-post

diff --git a/glance/values.yaml b/glance/values.yaml
@@ -26,8 +26,8 @@ development:
   storage_path: /data/openstack-helm/glance/images
 
 labels:
-  node_selector_key: openstack-control-plane
-  node_selector_value: enabled
+  control_node_selector_key: openstack-control-plane
+  control_node_selector_value: enabled
 
 images:
   db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton

diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml
@@ -30,7 +30,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: heat-api
           image: {{ .Values.images.api }}

diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml
@@ -30,7 +30,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: heat-cfn
           image: {{ .Values.images.cfn }}

diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml
@@ -30,7 +30,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: heat-cloudwatch
           image: {{ .Values.images.cloudwatch }}

diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: heat-db-init
           image: {{ .Values.images.db_init | quote }}

diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: heat-db-sync
           image: {{ .Values.images.db_sync }}

diff --git a/heat/templates/job-ks-endpoints.yaml.yaml b/heat/templates/job-ks-endpoints.yaml.yaml
@@ -29,7 +29,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
 {{- range $key1, $osServiceType := tuple "orchestration" "cloudformation" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}

diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml
@@ -29,7 +29,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
 {{- range $key1, $osServiceType := tuple "orchestration" "cloudformation" }}
         - name: {{ $osServiceType }}-ks-service-registration

diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: heat-ks-user
           image: {{ .Values.images.ks_user }}

diff --git a/heat/templates/statefulset-engine.yaml b/heat/templates/statefulset-engine.yaml
@@ -31,7 +31,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: heat-engine
           image: {{ .Values.images.engine }}

diff --git a/heat/values.yaml b/heat/values.yaml
@@ -25,8 +25,8 @@ replicas:
   engine: 1
 
 labels:
-  node_selector_key: openstack-control-plane
-  node_selector_value: enabled
+  control_node_selector_key: openstack-control-plane
+  control_node_selector_value: enabled
 
 images:
   dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0

diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: horizon
           image: {{ .Values.images.horizon }}

diff --git a/horizon/values.yaml b/horizon/values.yaml
@@ -32,8 +32,8 @@ upgrades:
     max_surge: 3
 
 labels:
-  node_selector_key: openstack-control-plane
-  node_selector_value: enabled
+  control_node_selector_key: openstack-control-plane
+  control_node_selector_value: enabled
 
 network:
   port: 80

diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: keystone-api
           image: {{ .Values.images.api }}

diff --git a/keystone/templates/job-db-init.yaml b/keystone/templates/job-db-init.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: keystone-db-init
           image: {{ .Values.images.db_init }}

diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: keystone-db-sync
           image: {{ .Values.images.db_sync }}

diff --git a/keystone/values.yaml b/keystone/values.yaml
@@ -20,8 +20,8 @@
 replicas: 1
 
 labels:
-  node_selector_key: openstack-control-plane
-  node_selector_value: enabled
+  control_node_selector_key: openstack-control-plane
+  control_node_selector_value: enabled
 
 images:
   db_init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton

diff --git a/maas/templates/deploy-rack.yaml b/maas/templates/deploy-rack.yaml
@@ -23,7 +23,7 @@ spec:
         app: maas-rack-controller
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       hostNetwork: true
       dnsPolicy: ClusterFirst
       containers:

diff --git a/maas/templates/deploy-region.yaml b/maas/templates/deploy-region.yaml
@@ -54,7 +54,7 @@ spec:
         ]'
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
       - name: maas-region
         image: {{ .Values.images.maas_region }}

diff --git a/maas/values.yaml b/maas/values.yaml
@@ -49,8 +49,8 @@ jobs:
     timeout: 900
 
 labels:
-  node_selector_key: openstack-control-plane
-  node_selector_value: enabled
+  control_node_selector_key: openstack-control-plane
+  control_node_selector_value: enabled
 
 network:
   port:

diff --git a/mariadb/templates/deployment.yaml b/mariadb/templates/deployment.yaml
@@ -52,7 +52,7 @@ spec:
           }
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: {{ .Values.service_name }}
           image: {{ .Values.images.mariadb }}

diff --git a/mariadb/templates/job-seed.yaml b/mariadb/templates/job-seed.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       restartPolicy: Never
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: mariadb-init
           image: {{ .Values.images.mariadb }}