openstack/openstack-helm
Code Issues Proposed changes

A few changes according to Alan's review.

Browse Source 
Signed-off-by: DTadrzak <daniel.tadrzak@intel.com>
This commit is contained in:
DTadrzak 2017-01-13 13:27:13 +01:00
parent fcc594aac8
commit d3d38876c8
38 changed files with 92 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.api }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.scheduler }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.scheduler | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.volume }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.volume | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

4
cinder/templates/job-db-init.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.db_init }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_init | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
cinder/templates/job-db-sync.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.db_sync }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
cinder/templates/job-ks-endpoints.yaml.yaml
View File

@ -8,8 +8,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.ks_endpoints }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_endpoints | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
cinder/templates/job-ks-service.yaml
View File

@ -8,8 +8,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.ks_service }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_service | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
cinder/templates/job-ks-user.yaml
View File

@ -8,8 +8,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.ks_user }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_user | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

22
common/templates/_funcs.tpl
View File

@ -22,17 +22,17 @@
{{- include $wtf $context | sha256sum | quote -}}
{{- end -}}
{{- define "init-containers-header"}}
pod.beta.kubernetes.io/init-containers: '[
{
"name": "init",
"image": {{ .Values.images.dep_check | default "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0" | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | default "IfNotPresent" | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{{- define "dep-check-init-cont-header"}}
pod.beta.kubernetes.io/init-containers: '[
{
"name": "init",
"image": {{ .Values.images.dep_check | default "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0" | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | default "IfNotPresent" | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{{- end -}}
{{- define "init-containers-footer" }}

4
glance/templates/api.yaml
View File

@ -17,8 +17,8 @@ spec:
labels:
app: glance-api
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.api }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

4
glance/templates/db-sync.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.db_sync }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
glance/templates/init.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.init }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.init | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
glance/templates/post.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.post }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.post | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

4
glance/templates/registry.yaml
View File

@ -9,8 +9,8 @@ spec:
labels:
app: glance-registry
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.registry }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.registry | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -9,8 +9,8 @@ spec:
labels:
app: heat-api
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.api }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -9,8 +9,8 @@ spec:
labels:
app: heat-cfn
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.cnf }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.cnf | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -9,8 +9,8 @@ spec:
labels:
app: heat-cloudwatch
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.cloudwatch }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.cloudwatch | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

4
heat/templates/job-db-init.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.db_init }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_init | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
heat/templates/job-db-sync.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.db_sync }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
heat/templates/job-ks-endpoints.yaml.yaml
View File

@ -8,8 +8,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.ks_endpoints }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_endpoints | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
heat/templates/job-ks-service.yaml
View File

@ -8,8 +8,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.ks_service }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_service | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
heat/templates/job-ks-user.yaml
View File

@ -11,8 +11,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.ks_user }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_user | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

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

@ -10,8 +10,8 @@ spec:
labels:
app: heat-engine
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.engine }}
{{ include "dep-check-init-cont-header" . }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.engine }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

4
horizon/templates/deployment.yaml
View File

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.dashboard }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.dashboard | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

4
keystone/templates/deployment.yaml
View File

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.api }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

4
keystone/templates/job-db-sync.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.db_sync }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
keystone/templates/job-init.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.init }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.init | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

9
mariadb_restart.sh Normal file
View File

@ -0,0 +1,9 @@
helm delete mariadb --purge && rm mariadb-0.1.0.tgz && helm lint mariadb && helm package mariadb && helm install --replace --name mariadb mariadb-0.1.0.tgz
helm delete keystone --purge && rm keystone-0.1.0.tgz && helm lint keystone && helm package keystone && helm install --replace --name keystone keystone-0.1.0.tgz --dry-run
helm delete memcached --purge && rm memcached-0.1.0.tgz && helm lint memcached && helm package memcached && helm install --replace --name memcached memcached-0.1.0.tgz
helm delete common --purge && rm common-0.1.0.tgz && helm lint common && helm package common && helm install --replace --name common common-0.1.0.tgz
helm delete glance --purge && rm glance-0.1.0.tgz && helm lint glance && helm package glance && helm install --replace --name glance glance-0.1.0.tgz
helm delete nova --purge && rm nova-0.1.0.tgz && helm lint nova && helm package nova && helm install --replace --name nova nova-0.1.0.tgz
helm delete rabbitmq --purge && rm rabbitmq-0.1.0.tgz && helm lint rabbitmq && helm package rabbitmq && helm install --replace --name rabbitmq rabbitmq-0.1.0.tgz

4
nova/templates/daemonset-compute.yaml
View File

@ -10,8 +10,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.compute }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.compute | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }}

4
nova/templates/daemonset-libvirt.yaml
View File

@ -10,8 +10,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.libvirt }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.libvirt | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }}

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

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.api }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

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

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.api }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

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

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.conductor }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.conductor | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

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

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.consoleauth }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.consoleauth | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

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

@ -19,8 +19,8 @@ spec:
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.scheduler }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.scheduler | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

4
nova/templates/job-db-sync.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.db_sync }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
nova/templates/job-init.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.init }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.init | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector:

4
nova/templates/job-post.yaml
View File

@ -6,8 +6,8 @@ spec:
template:
metadata:
annotations:
{{ include "init-containers-header" . }}
{{ include "init-containers-footer" .Values.dependencies.post }}
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.post | indent 8 }}
spec:
restartPolicy: OnFailure
nodeSelector: