From 2ce3100218d3bf63784bd6b84f9b91a624d9b2ab Mon Sep 17 00:00:00 2001 From: Renis Makadia Date: Tue, 14 Mar 2017 12:12:27 -0700 Subject: [PATCH] Fixed issue #207 by updating label's key and value for openstack-control-plane in following:docs, glance, rabbitmq, postgresql, memcached, mariadb, maas, keystone, horizon, heat, etcd, cinder and neutron --- cinder/templates/deployment-api.yaml | 2 +- cinder/templates/deployment-scheduler.yaml | 2 +- cinder/templates/deployment-volume.yaml | 2 +- cinder/templates/job-db-init.yaml | 2 +- cinder/templates/job-db-sync.yaml | 4 ++-- cinder/templates/job-ks-endpoints.yaml | 2 +- cinder/templates/job-ks-service.yaml | 2 +- cinder/templates/job-ks-user.yaml | 2 +- cinder/values.yaml | 4 ++-- docs/helm_overrides.md | 20 +++++++++---------- etcd/templates/deployment.yaml | 2 +- etcd/values.yaml | 4 ++-- glance/templates/deployment-api.yaml | 2 +- glance/templates/deployment-registry.yaml | 2 +- glance/templates/job-db-init.yaml | 2 +- glance/templates/job-db-sync.yaml | 2 +- glance/templates/job-post.yaml | 2 +- glance/values.yaml | 4 ++-- heat/templates/deployment-api.yaml | 2 +- heat/templates/deployment-cfn.yaml | 2 +- heat/templates/deployment-cloudwatch.yaml | 2 +- heat/templates/job-db-init.yaml | 2 +- heat/templates/job-db-sync.yaml | 2 +- heat/templates/job-ks-endpoints.yaml.yaml | 2 +- heat/templates/job-ks-service.yaml | 2 +- heat/templates/job-ks-user.yaml | 2 +- heat/templates/statefulset-engine.yaml | 2 +- heat/values.yaml | 4 ++-- horizon/templates/deployment.yaml | 2 +- horizon/values.yaml | 4 ++-- keystone/templates/deployment.yaml | 2 +- keystone/templates/job-db-init.yaml | 2 +- keystone/templates/job-db-sync.yaml | 2 +- keystone/values.yaml | 4 ++-- maas/templates/deploy-rack.yaml | 2 +- maas/templates/deploy-region.yaml | 2 +- maas/values.yaml | 4 ++-- mariadb/templates/deployment.yaml | 2 +- mariadb/templates/job-seed.yaml | 2 +- mariadb/values.yaml | 4 ++-- memcached/templates/deployment.yaml | 2 +- memcached/values.yaml | 4 ++-- neutron/templates/daemonset-dhcp-agent.yaml | 2 +- neutron/templates/daemonset-l3-agent.yaml | 2 +- .../templates/daemonset-metadata-agent.yaml | 2 +- neutron/templates/deployment-server.yaml | 2 +- neutron/templates/job-db-init.yaml | 2 +- neutron/templates/job-db-sync.yaml | 2 +- neutron/templates/job-post.yaml | 2 +- neutron/values.yaml | 16 +++++++-------- postgresql/templates/deployment.yaml | 2 +- postgresql/values.yaml | 4 ++-- rabbitmq/templates/deployment.yaml | 2 +- rabbitmq/values.yaml | 4 ++-- 54 files changed, 82 insertions(+), 82 deletions(-) diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index 52705f8a..0b0ffafe 100644 --- 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 index de5d42c8..87c1623f 100644 --- 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 index bd4517eb..dc206aa3 100644 --- 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 index c00a207e..5705b5d2 100644 --- 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 index 0296b1ee..0c9b0de6 100644 --- 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 index b554fb1b..a8e7e32b 100644 --- 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 index 77c42572..0825c71b 100644 --- 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 index 8c2d53be..9777e686 100644 --- 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 index 22e65603..00b50833 100644 --- 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 index 1e8eb8b9..d619c66b 100644 --- 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 index b0a4e43d..9560ae98 100644 --- 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 index def8d369..e0a794df 100644 --- 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 index 20bbfcc0..73a4d941 100644 --- 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 index 1f205bcc..ef327f19 100644 --- 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 index 7b2abe73..7237018a 100644 --- 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 index 228daddd..f3447e6b 100644 --- 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 index 54680a90..5acfce4f 100644 --- 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 index 4d09b50c..077500eb 100644 --- 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 index c0901356..c08aca5a 100755 --- 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 index 84cd91f7..fb45f0c3 100644 --- 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 index d1b99af4..edd253e7 100644 --- 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 index 622e98fb..d3703de9 100644 --- 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 index 51e62b63..64013bd4 100644 --- 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 index cda77c03..eca9c6df 100644 --- 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 index 5da519c1..31501bf6 100644 --- 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 index e7d0c4af..0b8b8f76 100644 --- 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 index b92d567b..9435c893 100644 --- 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 index c07fa353..17748115 100644 --- 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 index 20cc8c29..a1d886fa 100644 --- 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 index 08cace4d..b4be21fc 100644 --- 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 index c90e6851..b1127922 100644 --- 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 index 165442cc..56f2cf45 100644 --- 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 index 0d5763d4..dd26f2b5 100644 --- 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 index 05bf4a52..e14e12a8 100644 --- 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 index 0549e04d..699b1b5d 100644 --- 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 index 96f7b769..f5d3ee5c 100644 --- 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 index 5c7f8e92..fa169676 100644 --- 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 index df04d10e..d0ee49a0 100644 --- 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 index 90b49dc3..f530bdc7 100644 --- 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 }} diff --git a/mariadb/values.yaml b/mariadb/values.yaml index b5943c6d..e5ae41bd 100644 --- a/mariadb/values.yaml +++ b/mariadb/values.yaml @@ -61,8 +61,8 @@ volume: size: 20Gi 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/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index f9c755b7..ffc514c0 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -32,7 +32,7 @@ spec: app: memcached 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: memcached image: {{ .Values.images.memcached }} diff --git a/memcached/values.yaml b/memcached/values.yaml index 4063109a..9d04570e 100644 --- a/memcached/values.yaml +++ b/memcached/values.yaml @@ -29,8 +29,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: 11211 diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index 8d223c54..f9c83493 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/neutron/templates/daemonset-dhcp-agent.yaml @@ -31,7 +31,7 @@ spec: ]' spec: nodeSelector: - {{ .Values.labels.agent.dhcp.node_selector_key }}: {{ .Values.labels.agent.dhcp.node_selector_value }} + {{ .Values.labels.agent.dhcp.control_node_selector_key }}: {{ .Values.labels.agent.dhcp.control_node_selector_value }} securityContext: runAsUser: 0 dnsPolicy: ClusterFirst diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index f47af211..a02052a2 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/neutron/templates/daemonset-l3-agent.yaml @@ -31,7 +31,7 @@ spec: ]' spec: nodeSelector: - {{ .Values.labels.agent.l3.node_selector_key }}: {{ .Values.labels.agent.l3.node_selector_value }} + {{ .Values.labels.agent.l3.control_node_selector_key }}: {{ .Values.labels.agent.l3.control_node_selector_value }} securityContext: runAsUser: 0 dnsPolicy: ClusterFirst diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index 19c8d721..874691e1 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/neutron/templates/daemonset-metadata-agent.yaml @@ -31,7 +31,7 @@ spec: ]' spec: nodeSelector: - {{ .Values.labels.agent.metadata.node_selector_key }}: {{ .Values.labels.agent.metadata.node_selector_value }} + {{ .Values.labels.agent.metadata.control_node_selector_key }}: {{ .Values.labels.agent.metadata.control_node_selector_value }} securityContext: runAsUser: 0 dnsPolicy: ClusterFirst diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index 2abc7a8e..c14a00ee 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -40,7 +40,7 @@ spec: ]' spec: nodeSelector: - {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} + {{ .Values.labels.server.control_node_selector_key }}: {{ .Values.labels.server.control_node_selector_value }} containers: - name: neutron-server image: {{ .Values.images.server }} diff --git a/neutron/templates/job-db-init.yaml b/neutron/templates/job-db-init.yaml index 13a75add..704dea09 100644 --- a/neutron/templates/job-db-init.yaml +++ b/neutron/templates/job-db-init.yaml @@ -28,7 +28,7 @@ spec: spec: restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} + {{ .Values.labels.server.control_node_selector_key }}: {{ .Values.labels.server.control_node_selector_value }} containers: - name: neutron-db-init image: {{ .Values.images.db_init }} diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml index 15790fb2..58f11e2d 100644 --- a/neutron/templates/job-db-sync.yaml +++ b/neutron/templates/job-db-sync.yaml @@ -28,7 +28,7 @@ spec: spec: restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} + {{ .Values.labels.server.control_node_selector_key }}: {{ .Values.labels.server.control_node_selector_value }} containers: - name: neutron-db-sync image: {{ .Values.images.db_sync }} diff --git a/neutron/templates/job-post.yaml b/neutron/templates/job-post.yaml index a8c23e31..631cb7e4 100644 --- a/neutron/templates/job-post.yaml +++ b/neutron/templates/job-post.yaml @@ -28,7 +28,7 @@ spec: spec: restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} + {{ .Values.labels.server.control_node_selector_key }}: {{ .Values.labels.server.control_node_selector_value }} containers: - name: neutron-post image: {{ .Values.images.post }} diff --git a/neutron/values.yaml b/neutron/values.yaml index a5cd3c6d..89a2b553 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -51,17 +51,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 network: dns: diff --git a/postgresql/templates/deployment.yaml b/postgresql/templates/deployment.yaml index d33ab68a..4628cd36 100644 --- a/postgresql/templates/deployment.yaml +++ b/postgresql/templates/deployment.yaml @@ -25,7 +25,7 @@ spec: app: {{ .Values.service_name }} 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.postgresql }} diff --git a/postgresql/values.yaml b/postgresql/values.yaml index 0353eee5..4d3b2806 100644 --- a/postgresql/values.yaml +++ b/postgresql/values.yaml @@ -35,8 +35,8 @@ volume: size: 20Gi 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/rabbitmq/templates/deployment.yaml b/rabbitmq/templates/deployment.yaml index c71ba6ac..b90d2e1f 100644 --- a/rabbitmq/templates/deployment.yaml +++ b/rabbitmq/templates/deployment.yaml @@ -57,7 +57,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 }} volumes: - name: rabbitmq-emptydir emptyDir: {} diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index c353b815..c5181059 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -30,8 +30,8 @@ resources: cpu: "500m" labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + control_node_selector_key: openstack-control-plane + control_node_selector_value: enabled upgrades: revision_history: 3