openstack/openstack-helm
Code Issues Proposed changes

A few changes according to intlabs's review.

Browse Source 
Signed-off-by: DTadrzak <daniel.tadrzak@intel.com>
This commit is contained in:
DTadrzak 2017-01-16 10:47:43 +01:00
parent f4283675d5
commit 71427ce905
38 changed files with 206 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.scheduler }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.scheduler | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.volume }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.volume | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_init | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,5 +1,6 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- $ksAdminSecret := $envAll.Values.keystone.admin_secret | default "cinder-env-keystone-admin" }} {{- $ksAdminSecret := $envAll.Values.keystone.admin_secret | default "cinder-env-keystone-admin" }}
{{- $dependecies := .Values.dependencies.ks_endpoints }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -8,8 +9,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_endpoints | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,5 +1,6 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }} {{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }}
{{- $dependecies := .Values.dependencies.ks_service }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -8,8 +9,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_service | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,5 +1,7 @@
{{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }} {{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }}
{{- $ksUserSecret := .Values.keystone.user_secret | default "cinder-env-keystone-user" }} {{- $ksUserSecret := .Values.keystone.user_secret | default "cinder-env-keystone-user" }}
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.ks_user }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -8,8 +10,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_user | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

63
common/templates/_funcs.tpl
View File

@ -22,37 +22,34 @@
{{- include $wtf $context | sha256sum | quote -}} {{- include $wtf $context | sha256sum | quote -}}
{{- end -}} {{- end -}}
{{- define "dep-check-init-cont-header" -}} {{- define "dep-check-init-cont" -}}
pod.beta.kubernetes.io/init-containers: '[ {{- $envALL := index . 0 -}}
{ {{- $deps := index . 1 -}}
"name": "init", {
"image": {{ .Values.images.dep_check | default "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0" | quote }}, "name": "init",
"imagePullPolicy": {{ .Values.images.pull_policy | default "IfNotPresent" | quote }}, "image": {{ $envALL.Values.images.dep_check | default "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0" | quote }},
"env": [ "imagePullPolicy": {{ $envALL.Values.images.pull_policy | default "IfNotPresent" | quote }},
{ "env": [
"name": "NAMESPACE", {
"value": "{{ .Release.Namespace }}" "name": "NAMESPACE",
}, "value": "{{ $envALL.Release.Namespace }}"
{{- end -}} },
{
{{- define "dep-check-init-cont-footer" }} "name": "INTERFACE_NAME",
{ "value": "eth0"
"name": "INTERFACE_NAME", },
"value": "eth0" {
}, "name": "DEPENDENCY_SERVICE",
{ "value": "{{ include "joinListWithColon" $deps.service }}"
"name": "DEPENDENCY_SERVICE", },
"value": "{{ include "joinListWithColon" .service }}" {
}, "name": "DEPENDENCY_JOBS",
{ "value": "{{ include "joinListWithColon" $deps.jobs }}"
"name": "DEPENDENCY_JOBS", },
"value": "{{ include "joinListWithColon" .jobs }}" {
}, "name": "COMMAND",
{ "value": "echo done"
"name": "COMMAND", }
"value": "echo done" ]
} }
]
}
]'
{{- end -}} {{- end -}}

7
glance/templates/api.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -17,8 +19,9 @@ spec:
labels: labels:
app: glance-api app: glance-api
annotations: annotations:
{{- include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{- include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

7
glance/templates/init.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.init | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

7
glance/templates/post.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.post }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.post | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

7
glance/templates/registry.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.registry }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -9,8 +11,9 @@ spec:
labels: labels:
app: glance-registry app: glance-registry
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.registry | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -9,8 +11,9 @@ spec:
labels: labels:
app: heat-api app: heat-api
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.cnf }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -9,8 +11,9 @@ spec:
labels: labels:
app: heat-cfn app: heat-cfn
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.cnf | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.cloudwatch }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -9,8 +11,9 @@ spec:
labels: labels:
app: heat-cloudwatch app: heat-cloudwatch
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.cloudwatch | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_init | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,5 +1,6 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- $ksAdminSecret := .Values.keystone_secrets.admin }} {{- $ksAdminSecret := .Values.keystone_secrets.admin }}
{{- $dependecies := .Values.dependencies.ks_endpoints }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -8,8 +9,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_endpoints | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,5 +1,6 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- $ksAdminSecret := .Values.keystone_secrets.admin }} {{- $ksAdminSecret := .Values.keystone_secrets.admin }}
{{- $dependecies := .Values.dependencies.ks_service }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -8,8 +9,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_service | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.ks_user }}
{{- $ksAdminSecret := .Values.keystone_secrets.admin }} {{- $ksAdminSecret := .Values.keystone_secrets.admin }}
{{- $ksUserSecret := .Values.keystone_secrets.user }} {{- $ksUserSecret := .Values.keystone_secrets.user }}
# The heat user management job is a bit different from other services as it also needs to create a stack domain and trusts user # The heat user management job is a bit different from other services as it also needs to create a stack domain and trusts user
@ -11,8 +13,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.ks_user | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.engine }}
apiVersion: apps/v1beta1 apiVersion: apps/v1beta1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
@ -10,8 +12,9 @@ spec:
labels: labels:
app: heat-engine app: heat-engine
annotations: annotations:
{{ include "dep-check-init-cont-header" . }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.engine }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

7
horizon/templates/deployment.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.dashboard }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.dashboard | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

7
keystone/templates/deployment.yaml
View File

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.init | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

9
mariadb_restart.sh
View File

@ -1,9 +0,0 @@
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

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.compute }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
@ -10,8 +12,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.compute | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }} {{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.libvirt }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
@ -10,8 +12,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.libvirt | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }} {{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.conductor }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.conductor | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.consoleauth }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.consoleauth | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.scheduler }}
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
@ -19,8 +21,9 @@ spec:
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.scheduler | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }} {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.init | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -1,3 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.post }}
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
@ -6,8 +8,9 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }} pod.beta.kubernetes.io/init-containers: '[
{{ include "dep-check-init-cont-footer" .Values.dependencies.post | indent 8 }} {{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector: