openstack/openstack-helm
Code Issues Proposed changes

Adding: templates for init-containers. Unfortunately I need to break it for

Browse Source 
two templates, because i don't how to pass two variables to template.

PR also adjust layout of configuration files in Nova.

Signed-off-by: DTadrzak <daniel.tadrzak@intel.com>
This commit is contained in:
DTadrzak 2017-01-11 14:29:04 +01:00
parent 49133ce86b
commit fcc594aac8
41 changed files with 131 additions and 928 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,31 +19,8 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.api }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -19,31 +19,8 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.scheduler }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.scheduler.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.scheduler.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -19,31 +19,8 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.volume }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.volume.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.volume.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -6,31 +6,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.db_init }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -6,31 +6,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.db_sync }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -8,27 +8,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.ks_endpoints }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_service.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -8,27 +8,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.ks_service }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_service.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -8,27 +8,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.ks_user }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_user.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

35
common/templates/_funcs.tpl
View File

@ -21,3 +21,38 @@
{{- $wtf := $context.Template.Name | replace $last $name -}} {{- $wtf := $context.Template.Name | replace $last $name -}}
{{- include $wtf $context | sha256sum | quote -}} {{- include $wtf $context | sha256sum | quote -}}
{{- end -}} {{- 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 }}"
},
{{- end -}}
{{- define "init-containers-footer" }}
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
{{- end -}}

28
glance/templates/api.yaml
View File

@ -17,35 +17,11 @@ spec:
labels: labels:
app: glance-api app: glance-api
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.api }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers: containers:
- name: glance-api - name: glance-api
image: {{ .Values.images.api }} image: {{ .Values.images.api }}

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

@ -6,31 +6,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.db_sync }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

27
glance/templates/init.yaml
View File

@ -6,31 +6,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.init }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

27
glance/templates/post.yaml
View File

@ -6,31 +6,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.post }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.post.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.post.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

27
glance/templates/registry.yaml
View File

@ -9,31 +9,8 @@ spec:
labels: labels:
app: glance-registry app: glance-registry
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.registry }}
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.registry.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.registry.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

1
glance/values.yaml
View File

@ -15,6 +15,7 @@ images:
init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
registry: quay.io/stackanetes/stackanetes-glance-registry:newton registry: quay.io/stackanetes/stackanetes-glance-registry:newton
post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
upgrades: upgrades:

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

@ -9,31 +9,8 @@ spec:
labels: labels:
app: heat-api app: heat-api
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.api }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -9,31 +9,8 @@ spec:
labels: labels:
app: heat-cfn app: heat-cfn
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.cnf }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.cfn.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.cfn.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -9,31 +9,8 @@ spec:
labels: labels:
app: heat-cloudwatch app: heat-cloudwatch
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.cloudwatch }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.cloudwatch.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.cloudwatch.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -6,31 +6,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.db_init }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -6,31 +6,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.db_sync }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -8,27 +8,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.ks_endpoints }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_service.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -8,27 +8,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.ks_service }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_service.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -11,27 +11,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.ks_user }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.ks_user.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -10,31 +10,8 @@ spec:
labels: labels:
app: heat-engine app: heat-engine
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.engine }}
"name": "init",
"image": {{ .Values.images.dep_check | quote }},
"imagePullPolicy": {{ .Values.images.pull_policy | quote }},
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.engine.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.engine.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

23
horizon/templates/deployment.yaml
View File

@ -19,27 +19,8 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.dashboard }}
"name": "init",
"image": "{{ .Values.images.entrypoint }}",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.dashboard.service }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

2
horizon/values.yaml
View File

@ -6,7 +6,7 @@
replicas: 1 replicas: 1
images: images:
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
horizon: quay.io/stackanetes/stackanetes-horizon:newton horizon: quay.io/stackanetes/stackanetes-horizon:newton
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

33
keystone/templates/deployment.yaml
View File

@ -18,36 +18,9 @@ spec:
app: keystone-api app: keystone-api
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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.api }}
"name": "init",
"image": "{{ .Values.images.entrypoint }}",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

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

@ -6,31 +6,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.db_sync }}
"name": "init",
"image": "{{ .Values.images.entrypoint }}",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

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

@ -6,31 +6,8 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.init }}
"name": "init",
"image": "{{ .Values.images.entrypoint }}",
"imagePullPolicy": "{{ .Values.images.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:

2
keystone/values.yaml
View File

@ -13,7 +13,7 @@ images:
db_sync: quay.io/stackanetes/stackanetes-keystone-api:newton db_sync: quay.io/stackanetes/stackanetes-keystone-api:newton
api: quay.io/stackanetes/stackanetes-keystone-api:newton api: quay.io/stackanetes/stackanetes-keystone-api:newton
init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
upgrades: upgrades:

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

@ -10,35 +10,8 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.compute }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.compute.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.compute.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
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 }}
@ -49,8 +22,8 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: nova-compute - name: nova-compute
image: {{ .Values.image.compute }} image: {{ .Values.images.compute }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
command: command:

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

@ -10,35 +10,8 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.libvirt }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.libvirt.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.libvirt.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
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 }}
@ -48,8 +21,8 @@ spec:
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
containers: containers:
- name: nova-libvirt - name: nova-libvirt
image: {{ .Values.image.libvirt }} image: {{ .Values.images.libvirt }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
command: command:

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

@ -19,42 +19,15 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.api }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
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 }}
containers: containers:
- name: nova-api-metadata - name: nova-api
image: {{ .Values.image.api }} image: {{ .Values.images.api }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
# https://bugs.launchpad.net/kolla-mesos/+bug/1546007 # https://bugs.launchpad.net/kolla-mesos/+bug/1546007
securityContext: securityContext:
capabilities: capabilities:

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

@ -19,41 +19,14 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.api }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.api.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
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 }}
containers: containers:
- name: nova-api-osapi - name: nova-osapi
image: {{ .Values.image.api }} image: {{ .Values.images.api }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.image.pull_policy }}
securityContext: securityContext:
capabilities: capabilities:

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

@ -19,41 +19,14 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.conductor }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.conductor.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.conductor.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
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 }}
containers: containers:
- name: nova-conductor - name: nova-conductor
image: {{ .Values.image.conductor }} image: {{ .Values.images.conductor }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.image.pull_policy }}
command: command:
- nova-conductor - nova-conductor

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

@ -19,41 +19,14 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.consoleauth }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.consoleauth.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.consoleauth.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
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 }}
containers: containers:
- name: nova-consoleauth - name: nova-consoleauth
image: {{ .Values.image.consoleauth }} image: {{ .Values.images.consoleauth }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.image.pull_policy }}
command: command:
- nova-consoleauth - nova-consoleauth

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

@ -19,41 +19,14 @@ 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" }}
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.scheduler }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.scheduler.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.scheduler.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
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 }}
containers: containers:
- name: nova-scheduler - name: nova-scheduler
image: {{ .Values.image.scheduler }} image: {{ .Values.images.scheduler }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.image.pull_policy }}
command: command:
- nova-scheduler - nova-scheduler

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

@ -6,39 +6,16 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.db_sync }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.db_sync.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers: containers:
- name: nova-db-sync - name: nova-db-sync
image: {{ .Values.image.db_sync }} image: {{ .Values.images.db_sync }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
command: command:
- bash - bash
- /tmp/db-sync.sh - /tmp/db-sync.sh

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

@ -6,39 +6,16 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.init }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.init.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers: containers:
- name: nova-init - name: nova-init
image: {{ .Values.image.init }} image: {{ .Values.images.init }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
command: command:
- bash - bash
- /tmp/init.sh - /tmp/init.sh

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

@ -6,39 +6,16 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
pod.beta.kubernetes.io/init-containers: '[ {{ include "init-containers-header" . }}
{ {{ include "init-containers-footer" .Values.dependencies.post }}
"name": "init",
"image": "{{ .Values.image.entrypoint }}",
"imagePullPolicy": "{{ .Values.image.pull_policy }}",
"env": [
{
"name": "NAMESPACE",
"value": "{{ .Release.Namespace }}"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .Values.dependencies.post.service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .Values.dependencies.post.jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers: containers:
- name: nova-post - name: nova-post
image: {{ .Values.image.post }} image: {{ .Values.images.post }}
imagePullPolicy: {{ .Values.image.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
command: command:
- bash - bash
- /tmp/post.sh - /tmp/post.sh

4
nova/values.yaml
View File

@ -12,7 +12,7 @@ labels:
control_replicas: 1 control_replicas: 1
compute_replicas: 1 compute_replicas: 1
image: images:
init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton init: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
db_sync: quay.io/stackanetes/stackanetes-nova-api:newton db_sync: quay.io/stackanetes/stackanetes-nova-api:newton
api: quay.io/stackanetes/stackanetes-nova-api:newton api: quay.io/stackanetes/stackanetes-nova-api:newton
@ -23,7 +23,7 @@ image:
compute: quay.io/stackanetes/stackanetes-nova-compute:newton compute: quay.io/stackanetes/stackanetes-nova-compute:newton
libvirt: quay.io/stackanetes/stackanetes-nova-libvirt:newton libvirt: quay.io/stackanetes/stackanetes-nova-libvirt:newton
post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
upgrades: upgrades: