openstack/openstack-helm
Code Issues Proposed changes

Values: Move replicas to pod key

Browse Source 
This PS move s the replicas key to be under the pod key in the values.
It brings further consolation of related configuration params to be
nested under common keys across all charts.

Change-Id: I420b06debd0a62ba5d83497be43ff6c49c49d339
This commit is contained in:
Pete Birley 2017-07-13 22:44:26 -05:00
parent 956cf735d1
commit 4d066332a7
52 changed files with 108 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barbican/templates/deployment-api.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: barbican-api
spec:
replicas: {{ .Values.replicas.api }}
replicas: {{ .Values.pod.replicas.api }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

16
barbican/values.yaml
View File

@ -9,8 +9,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
replicas:
api: 1
labels:
node_selector_key: openstack-control-plane
@ -28,6 +26,8 @@ images:
pull_policy: "IfNotPresent"
pod:
replicas:
api: 1
lifecycle:
upgrades:
deployments:
@ -42,12 +42,12 @@ pod:
resources:
enabled: false
api:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "1024Mi"
cpu: "2000m"
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "1024Mi"
cpu: "2000m"
jobs:
bootstrap:
requests:

2
cinder/templates/deployment-api.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: cinder-api
spec:
replicas: {{ .Values.replicas.api }}
replicas: {{ .Values.pod.replicas.api }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
cinder/templates/deployment-backup.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: cinder-backup
spec:
replicas: {{ .Values.replicas.backup }}
replicas: {{ .Values.pod.replicas.backup }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
cinder/templates/deployment-scheduler.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: cinder-scheduler
spec:
replicas: {{ .Values.replicas.scheduler }}
replicas: {{ .Values.pod.replicas.scheduler }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
cinder/templates/deployment-volume.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: cinder-volume
spec:
replicas: {{ .Values.replicas.volume }}
replicas: {{ .Values.pod.replicas.volume }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

11
cinder/values.yaml
View File

@ -17,12 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
api: 1
volume: 1
scheduler: 1
backup: 1
storage: ceph
labels:
@ -45,6 +39,11 @@ images:
pull_policy: "IfNotPresent"
pod:
replicas:
api: 1
volume: 1
scheduler: 1
backup: 1
lifecycle:
upgrades:
deployments:

16
doc/source/install/multinode.rst
View File

@ -407,7 +407,7 @@ Now you can easily install the other services simply by going in order:
::
helm install --namespace=openstack --name=keystone local/keystone \
--set replicas=2
--set pod.replicas.api=2
**Install Horizon:**
@ -421,7 +421,8 @@ Now you can easily install the other services simply by going in order:
::
helm install --namespace=openstack --name=glance local/glance \
--set replicas.api=2,replicas.registry=2
--set pod.replicas.api=2 \
--set pod.replicas.registry=2
**Install Heat:**
@ -434,21 +435,26 @@ Now you can easily install the other services simply by going in order:
::
helm install --namespace=openstack --name=neutron local/neutron \
--set replicas.server=2
--set pod.replicas.server=2
**Install Nova:**
::
helm install --namespace=openstack --name=nova local/nova \
--set control_replicas=2
--set pod.replicas.api_metadata=2 \
--set pod.replicas.osapi=2 \
--set pod.replicas.conductor=2 \
--set pod.replicas.consoleauth=2 \
--set pod.replicas.scheduler=2 \
--set pod.replicas.novncproxy=2
**Install Cinder:**
::
helm install --namespace=openstack --name=cinder local/cinder \
--set replicas.api=2
--set pod.replicas.api=2
Final Checks
------------

2
etcd/templates/deployment.yaml
View File

@ -19,7 +19,7 @@ kind: Deployment
metadata:
name: etcd
spec:
replicas: {{ .Values.replicas.etcd }}
replicas: {{ .Values.pod.replicas.etcd }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

5
etcd/values.yaml
View File

@ -30,6 +30,8 @@ network:
port: 2379
pod:
replicas:
etcd: 1
lifecycle:
upgrades:
deployments:
@ -38,6 +40,3 @@ pod:
rolling_update:
max_surge: 3
max_unavailable: 1
replicas:
etcd: 1

2
glance/templates/deployment-api.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: glance-api
spec:
replicas: {{ .Values.replicas.api }}
replicas: {{ .Values.pod.replicas.api }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
glance/templates/deployment-registry.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: glance-registry
spec:
replicas: {{ .Values.replicas.registry }}
replicas: {{ .Values.pod.replicas.registry }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

7
glance/values.yaml
View File

@ -17,10 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
api: 1
registry: 1
# ceph or pvc
storage: ceph
@ -320,6 +316,9 @@ mounts:
glance_tests:
pod:
replicas:
api: 1
registry: 1
lifecycle:
upgrades:
deployments:

2
heat/templates/deployment-api.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: heat-api
spec:
replicas: {{ .Values.replicas.api }}
replicas: {{ .Values.pod.replicas.api }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
heat/templates/deployment-cfn.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: heat-cfn
spec:
replicas: {{ .Values.replicas.cfn }}
replicas: {{ .Values.pod.replicas.cfn }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
heat/templates/deployment-cloudwatch.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: heat-cloudwatch
spec:
replicas: {{ .Values.replicas.cloudwatch }}
replicas: {{ .Values.pod.replicas.cloudwatch }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
heat/templates/statefulset-engine.yaml
View File

@ -23,7 +23,7 @@ metadata:
name: heat-engine
spec:
serviceName: heat-engine
replicas: {{ .Values.replicas.engine }}
replicas: {{ .Values.pod.replicas.engine }}
template:
metadata:
labels:

12
heat/values.yaml
View File

@ -17,13 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
api: 1
cfn: 1
cloudwatch: 1
engine: 1
labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
@ -332,6 +325,11 @@ endpoints:
default: 5672
pod:
replicas:
api: 1
cfn: 1
cloudwatch: 1
engine: 1
lifecycle:
upgrades:
deployments:

2
horizon/templates/deployment.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: horizon
spec:
replicas: {{ .Values.replicas }}
replicas: {{ .Values.pod.replicas.server }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

4
horizon/values.yaml
View File

@ -17,7 +17,7 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas: 1
images:
db_init: docker.io/kolla/ubuntu-source-horizon:4.0.0
@ -62,6 +62,8 @@ dependencies:
endpoint: internal
pod:
replicas:
server: 1
lifecycle:
upgrades:
deployments:

2
ingress/templates/deployment-error.yaml
View File

@ -19,7 +19,7 @@ kind: Deployment
metadata:
name: ingress-error-pages
spec:
replicas: {{ .Values.replicas.error_page }}
replicas: {{ .Values.pod.replicas.error_page }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

1
ingress/templates/deployment-ingress.yaml
View File

@ -20,6 +20,7 @@ metadata:
name: ingress-api
spec:
{{- if eq .Values.deployment_type "Deployment" }}
replicas: {{ .Values.pod.replicas.ingress }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
{{- end }}
template:

7
ingress/values.yaml
View File

@ -17,10 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
ingress: 1
error_page: 1
images:
entrypoint: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
# https://github.com/kubernetes/ingress/blob/master/controllers/nginx/Changelog.md
@ -29,6 +25,9 @@ images:
pull_policy: "IfNotPresent"
pod:
replicas:
ingress: 1
error_page: 1
lifecycle:
upgrades:
deployments:

2
keystone/templates/deployment-api.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: keystone-api
spec:
replicas: {{ .Values.replicas.api }}
replicas: {{ .Values.pod.replicas.api }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

5
keystone/values.yaml
View File

@ -17,9 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
api: 1
labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
@ -86,6 +83,8 @@ dependencies:
endpoint: internal
pod:
replicas:
api: 1
lifecycle:
upgrades:
deployments:

2
magnum/templates/deployment-api.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: magnum-api
spec:
replicas: {{ .Values.replicas.api }}
replicas: {{ .Values.pod.replicas.api }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
magnum/templates/statefulset-conductor.yaml
View File

@ -23,7 +23,7 @@ metadata:
name: magnum-conductor
spec:
serviceName: magnum-conductor
replicas: {{ .Values.replicas.conductor }}
replicas: {{ .Values.pod.replicas.conductor }}
template:
metadata:
labels:

7
magnum/values.yaml
View File

@ -17,10 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
api: 1
conductor: 1
labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
@ -210,6 +206,9 @@ endpoints:
default: 5672
pod:
replicas:
api: 1
conductor: 1
lifecycle:
upgrades:
deployments:

2
mariadb/templates/statefulset.yaml
View File

@ -20,7 +20,7 @@ metadata:
name: mariadb
spec:
serviceName: "{{ tuple "oslo_db" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}-discovery"
replicas: {{ .Values.replicas }}
replicas: {{ .Values.pod.replicas.server }}
template:
metadata:
labels:

6
mariadb/values.yaml
View File

@ -12,18 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
replicas: 3
force_bootstrap: false
pod:
replicas:
server: 3
lifecycle:
disruption_budget:
mariadb:
min_available: 0
resources:
enabled: false
api:
server:
limits:
memory: "128Mi"
cpu: "500m"

4
memcached/templates/deployment.yaml
View File

@ -19,7 +19,7 @@ kind: Deployment
metadata:
name: memcached
spec:
replicas: {{ .Values.pod.resources.memcached.replicas }}
replicas: {{ .Values.pod.replicas.server }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:
@ -34,7 +34,7 @@ spec:
- name: memcached
image: {{ .Values.images.memcached }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: ["sh", "-xec"]
args:
- |

6
memcached/values.yaml
View File

@ -22,6 +22,8 @@ images:
pull_policy: "IfNotPresent"
pod:
replicas:
server: 1
lifecycle:
upgrades:
deployments:
@ -32,9 +34,7 @@ pod:
max_surge: 3
resources:
enabled: false
memcached:
replicas: 1
api:
server:
limits:
memory: "128Mi"
cpu: "500m"

2
mistral/templates/deployment-api.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: mistral-api
spec:
replicas: {{ .Values.replicas.api }}
replicas: {{ .Values.pod.replicas.api }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
mistral/templates/deployment-executor.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: mistral-executor
spec:
replicas: {{ .Values.replicas.executor }}
replicas: {{ .Values.pod.replicas.executor }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
mistral/templates/statefulset-engine.yaml
View File

@ -23,7 +23,7 @@ metadata:
name: mistral-engine
spec:
serviceName: mistral-engine
replicas: {{ .Values.replicas.engine }}
replicas: {{ .Values.pod.replicas.engine }}
template:
metadata:
labels:

2
mistral/templates/statefulset-event-engine.yaml
View File

@ -23,7 +23,7 @@ metadata:
name: mistral-event-engine
spec:
serviceName: mistral-event-engine
replicas: {{ .Values.replicas.event_engine }}
replicas: {{ .Values.pod.replicas.event_engine }}
template:
metadata:
labels:

11
mistral/values.yaml
View File

@ -17,12 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
api: 1
engine: 1
event_engine: 1
executor: 1
labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
@ -260,6 +254,11 @@ conf:
auth_version: v3
pod:
replicas:
api: 1
engine: 1
event_engine: 1
executor: 1
lifecycle:
upgrades:
deployments:

2
neutron/templates/deployment-server.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: neutron-server
spec:
replicas: {{ .Values.replicas.server }}
replicas: {{ .Values.pod.replicas.server }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

8
neutron/values.yaml
View File

@ -17,9 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
server: 1
images:
bootstrap: docker.io/kolla/ubuntu-source-neutron-server:3.0.3
test: docker.io/kolla/ubuntu-binary-rally:4.0.0
@ -93,9 +90,6 @@ network:
metadata:
port: 8775
metadata:
workers: 4
bootstrap:
enabled: false
script: |
@ -190,6 +184,8 @@ dependencies:
endpoint: internal
pod:
replicas:
server: 1
lifecycle:
upgrades:
deployments:

2
nova/templates/deployment-api-metadata.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: nova-api-metadata
spec:
replicas: {{ .Values.replicas.api_metadata }}
replicas: {{ .Values.pod.replicas.api_metadata }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
nova/templates/deployment-api-osapi.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: nova-api-osapi
spec:
replicas: {{ .Values.replicas.osapi }}
replicas: {{ .Values.pod.replicas.osapi }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
nova/templates/deployment-conductor.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: nova-conductor
spec:
replicas: {{ .Values.replicas.conductor }}
replicas: {{ .Values.pod.replicas.conductor }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
nova/templates/deployment-consoleauth.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: nova-consoleauth
spec:
replicas: {{ .Values.replicas.consoleauth }}
replicas: {{ .Values.pod.replicas.consoleauth }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
nova/templates/deployment-novncproxy.yaml
View File

@ -23,7 +23,7 @@ kind: Deployment
metadata:
name: nova-novncproxy
spec:
replicas: {{ .Values.replicas.novncproxy }}
replicas: {{ .Values.pod.replicas.novncproxy }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
nova/templates/deployment-scheduler.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: nova-scheduler
spec:
replicas: {{ .Values.replicas.scheduler }}
replicas: {{ .Values.pod.replicas.scheduler }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

15
nova/values.yaml
View File

@ -17,14 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
api_metadata: 1
osapi: 1
conductor: 1
consoleauth: 1
scheduler: 1
novncproxy: 1
labels:
agent:
compute:
@ -556,6 +548,13 @@ endpoints:
public: 80
pod:
replicas:
api_metadata: 1
osapi: 1
conductor: 1
consoleauth: 1
scheduler: 1
novncproxy: 1
lifecycle:
upgrades:
deployments:

2
rabbitmq/templates/bin/_rabbitmq-readiness.sh.tpl
View File

@ -33,7 +33,7 @@ main() {
return 1
fi
{{ if gt (.Values.replicas | int) 1 -}}
{{ if gt (.Values.pod.replicas.server | int) 1 -}}
if ! is-node-properly-clustered; then
log-it "Node is inconsistent with the rest of the cluster"
return 1

15
rabbitmq/templates/deployment.yaml
View File

@ -19,7 +19,7 @@ apiVersion: apps/v1beta1
metadata:
name: rabbitmq
spec:
replicas: {{ .Values.replicas }}
replicas: {{ .Values.pod.replicas.server }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:
@ -38,17 +38,8 @@ spec:
containers:
- name: rabbitmq
image: {{ .Values.images.rabbitmq }}
{{- if .Values.pod.resources.enabled }}
resources:
limits:
cpu: {{ .Values.pod.resources.api.limits.cpu | quote }}
memory: {{ .Values.pod.resources.api.limits.memory | quote }}
requests:
cpu: {{ .Values.pod.resources.api.requests.cpu | quote }}
memory: {{ .Values.pod.resources.api.requests.memory | quote }}
{{- end }}
{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:
- bash
- /scripts/start.sh
env:
- name: RABBITMQ_POD_IP
@ -59,14 +50,12 @@ spec:
timeoutSeconds: {{ .Values.probes_timeout }}
exec:
command:
- bash
- /scripts/rabbitmq-readiness.sh
livenessProbe:
initialDelaySeconds: {{ .Values.probes_delay }}
timeoutSeconds: {{ .Values.probes_timeout }}
exec:
command:
- bash
- /scripts/rabbitmq-liveness.sh
volumeMounts:
- name: rabbitmq-emptydir

8
rabbitmq/values.yaml
View File

@ -17,15 +17,13 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas: 3
labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
pod:
replicas:
server: 3
lifecycle:
upgrades:
revision_history: 3
@ -35,7 +33,7 @@ pod:
max_surge: 3
resources:
enabled: false
api:
server:
limits:
memory: "128Mi"
cpu: "500m"

2
senlin/templates/deployment-api.yaml
View File

@ -22,7 +22,7 @@ kind: Deployment
metadata:
name: senlin-api
spec:
replicas: {{ .Values.replicas.api }}
replicas: {{ .Values.pod.replicas.api }}
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
template:
metadata:

2
senlin/templates/statefulset-engine.yaml
View File

@ -23,7 +23,7 @@ metadata:
name: senlin-engine
spec:
serviceName: senlin-engine
replicas: {{ .Values.replicas.engine }}
replicas: {{ .Values.pod.replicas.engine }}
template:
metadata:
labels:

7
senlin/values.yaml
View File

@ -17,10 +17,6 @@
# Declare name/value pairs to be passed into your templates.
# name: value
replicas:
api: 1
engine: 1
labels:
node_selector_key: openstack-control-plane
node_selector_value: enabled
@ -210,6 +206,9 @@ endpoints:
default: 5672
pod:
replicas:
api: 1
engine: 1
lifecycle:
upgrades:
deployments: