openstack/openstack-helm
Code Issues Proposed changes

Merge "Cleanup - Adding volume overrides"

Browse Source
This commit is contained in:
Jenkins 2017-05-22 16:23:32 +00:00 committed by Gerrit Code Review
commit 3bb2c91bdb
11 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,8 @@
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.api }}
{{- $mounts_glance_api := .Values.mounts.glance_api.glance_api }}
{{- $mounts_glance_api_init := .Values.mounts.glance_api.init_container }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -36,7 +38,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
{{ tuple $envAll $dependencies $mounts_glance_api_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]'
spec:
nodeSelector:
@ -91,6 +93,7 @@ spec:
subPath: ceph.client.{{ .Values.conf.glance.glance_store.glance.store.rbd_store_user }}.keyring
readOnly: true
{{- end }}
{{ if $mounts_glance_api.volumeMounts }}{{ toYaml $mounts_glance_api.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: glance-etc
configMap:
@ -102,3 +105,4 @@ spec:
{{- end }}
- name: etcglance
emptyDir: {}
{{ if $mounts_glance_api.volumes }}{{ toYaml $mounts_glance_api.volumes | indent 8 }}{{ end }}

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

@ -14,6 +14,8 @@
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.registry }}
{{- $mounts_glance_registry := .Values.mounts.glance_registry.glance_registry }}
{{- $mounts_glance_registry_init := .Values.mounts.glance_registry.init_container }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -28,7 +30,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
{{ tuple $envAll $dependencies $mounts_glance_registry_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]'
spec:
nodeSelector:
@ -70,9 +72,11 @@ spec:
mountPath: /etc/glance/policy.json
subPath: policy.json
readOnly: true
{{ if $mounts_glance_registry.volumeMounts }}{{ toYaml $mounts_glance_registry.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: etcglance
emptyDir: {}
- name: glance-etc
configMap:
name: glance-etc
{{ if $mounts_glance_registry.volumes }}{{ toYaml $mounts_glance_registry.volumes | indent 8 }}{{ end }}

8
glance/values.yaml
View File

@ -317,3 +317,11 @@ endpoints:
scheme: rabbit
port:
amqp: 5672
mounts:
glance_api:
init_container: null
glance_api:
glance_registry:
init_container: null
glance_registry:

6
horizon/templates/deployment.yaml
View File

@ -14,6 +14,8 @@
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.dashboard }}
{{- $mounts_horizon := .Values.mounts.horizon.horizon }}
{{- $mounts_horizon_init := .Values.mounts.horizon.init_container }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -36,7 +38,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
{{ tuple $envAll $dependencies $mounts_horizon_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]'
spec:
nodeSelector:
@ -72,6 +74,7 @@ spec:
- name: horizon-etc
mountPath: /etc/openstack-dashboard/local_settings
subPath: local_settings
{{ if $mounts_horizon.volumeMounts }}{{ toYaml $mounts_horizon.volumeMounts | indent 12 }}{{ end }}
securityContext:
runAsUser: 0
volumes:
@ -81,3 +84,4 @@ spec:
- name: horizon-etc
configMap:
name: horizon-etc
{{ if $mounts_horizon.volumes }}{{ toYaml $mounts_horizon.volumes | indent 8 }}{{ end }}

5
horizon/values.yaml
View File

@ -77,3 +77,8 @@ endpoints:
port:
admin: 35357
api: 5000
mounts:
horizon:
init_container: null
horizon:

6
neutron/templates/daemonset-dhcp-agent.yaml
View File

@ -14,6 +14,8 @@
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.dhcp }}
{{- $mounts_neutron_dhcp_agent := .Values.mounts.neutron_dhcp_agent.neutron_dhcp_agent }}
{{- $mounts_neutron_dhcp_agent_init := .Values.mounts.neutron_dhcp_agent.init_container }}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -27,7 +29,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
{{ tuple $envAll $dependencies $mounts_neutron_dhcp_agent_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]'
spec:
nodeSelector:
@ -87,6 +89,7 @@ spec:
mountPath: /run/openvswitch
- name: socket
mountPath: /var/lib/neutron/openstack-helm
{{ if $mounts_neutron_dhcp_agent.volumeMounts }}{{ toYaml $mounts_neutron_dhcp_agent.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: neutron-bin
configMap:
@ -100,3 +103,4 @@ spec:
- name: socket
hostPath:
path: /var/lib/neutron/openstack-helm
{{ if $mounts_neutron_dhcp_agent.volumes }}{{ toYaml $mounts_neutron_dhcp_agent.volumes | indent 8 }}{{ end }}

6
neutron/templates/daemonset-l3-agent.yaml
View File

@ -14,6 +14,8 @@
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.l3 }}
{{- $mounts_neutron_l3_agent := .Values.mounts.neutron_l3_agent.neutron_l3_agent }}
{{- $mounts_neutron_l3_agent_init := .Values.mounts.neutron_l3_agent.init_container }}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -27,7 +29,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
{{ tuple $envAll $dependencies $mounts_neutron_l3_agent_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]'
spec:
nodeSelector:
@ -83,6 +85,7 @@ spec:
mountPath: /run/openvswitch
- name: socket
mountPath: /var/lib/neutron/stackanetes
{{ if $mounts_neutron_l3_agent.volumeMounts }}{{ toYaml $mounts_neutron_l3_agent.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: neutron-bin
configMap:
@ -96,3 +99,4 @@ spec:
- name: socket
hostPath:
path: /var/lib/neutron/stackanetes
{{ if $mounts_neutron_l3_agent.volumes }}{{ toYaml $mounts_neutron_l3_agent.volumes | indent 8 }}{{ end }}

6
neutron/templates/daemonset-metadata-agent.yaml
View File

@ -14,6 +14,8 @@
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.metadata }}
{{- $mounts_neutron_metadata_agent := .Values.mounts.neutron_metadata_agent.neutron_metadata_agent }}
{{- $mounts_neutron_metadata_agent_init := .Values.mounts.neutron_metadata_agent.init_container }}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -27,7 +29,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
{{ tuple $envAll $dependencies $mounts_neutron_metadata_agent_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]'
spec:
nodeSelector:
@ -85,6 +87,7 @@ spec:
mountPath: /run/openvswitch
- name: socket
mountPath: /var/lib/neutron/stackanetes
{{ if $mounts_neutron_metadata_agent.volumeMounts }}{{ toYaml $mounts_neutron_metadata_agent.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: neutron-bin
configMap:
@ -98,3 +101,4 @@ spec:
- name: socket
hostPath:
path: /var/lib/neutron/openstack-helm
{{ if $mounts_neutron_metadata_agent.volumes }}{{ toYaml $mounts_neutron_metadata_agent.volumes | indent 8 }}{{ end }}

6
neutron/templates/daemonset-ovs-agent.yaml
View File

@ -14,6 +14,8 @@
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ovs_agent }}
{{- $mounts_neutron_ovs_agent := .Values.mounts.neutron_ovs_agent.neutron_ovs_agent }}
{{- $mounts_neutron_ovs_agent_init := .Values.mounts.neutron_ovs_agent.init_container }}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -27,7 +29,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
{{ tuple $envAll $dependencies $mounts_neutron_ovs_agent_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]'
spec:
nodeSelector:
@ -87,6 +89,7 @@ spec:
- name: neutron-etc
mountPath: /etc/resolv.conf
subPath: resolv.conf
{{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: varlibopenvswitch
emptyDir: {}
@ -102,3 +105,4 @@ spec:
- name: run
hostPath:
path: /run
{{ if $mounts_neutron_ovs_agent.volumes }}{{ toYaml $mounts_neutron_ovs_agent.volumes | indent 8 }}{{ end }}

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

@ -14,6 +14,8 @@
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.server }}
{{- $mounts_neutron_server := .Values.mounts.neutron_server.neutron_server }}
{{- $mounts_neutron_server_init := .Values.mounts.neutron_server.init_container }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -36,7 +38,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
{{ tuple $envAll $dependencies $mounts_neutron_server_init | include "helm-toolkit.kubernetes_entrypoint_init_container" | indent 10 }}
]'
spec:
nodeSelector:
@ -83,6 +85,7 @@ spec:
mountPath: /etc/neutron/policy.json
subPath: policy.json
readOnly: true
{{ if $mounts_neutron_server.volumeMounts }}{{ toYaml $mounts_neutron_server.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: neutron-bin
configMap:
@ -90,3 +93,4 @@ spec:
- name: neutron-etc
configMap:
name: neutron-etc
{{ if $mounts_neutron_server.volumes }}{{ toYaml $mounts_neutron_server.volumes | indent 8 }}{{ end }}

17
neutron/values.yaml
View File

@ -485,3 +485,20 @@ endpoints:
scheme: mysql+pymysql
port:
mysql: 3306
mounts:
neutron_server:
init_container: null
neutron_server:
neutron_dhcp_agent:
init_container: null
neutron_dhcp_agent:
neutron_l3_agent:
init_container: null
neutron_l3_agent:
neutron_metadata_agent:
init_container: null
neutron_metadata_agent:
neutron_ovs_agent:
init_container: null
neutron_ovs_agent: