Enable taint toleration for horizon
This changes use the helm-toolkit template for toleration in openstack services Signed-off-by: Lucas Cavalcante <lucasmedeiros.cavalcante@windriver.com> Story: 2009276 Task: 43531 Depends-On: I168837f962465d1c89acc511b7bf4064ac4b546c Change-Id: Ic4bcea7fdbfe600343a42d801b3257aab593bd26
This commit is contained in:
parent
b786891a3a
commit
6af83764f0
@ -14,7 +14,7 @@ apiVersion: v1
|
|||||||
appVersion: v1.0.0
|
appVersion: v1.0.0
|
||||||
description: OpenStack-Helm Horizon
|
description: OpenStack-Helm Horizon
|
||||||
name: horizon
|
name: horizon
|
||||||
version: 0.2.17
|
version: 0.2.18
|
||||||
home: https://docs.openstack.org/horizon/latest/
|
home: https://docs.openstack.org/horizon/latest/
|
||||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
|
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -51,6 +51,9 @@ spec:
|
|||||||
{{ tuple $envAll "horizon" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
|
{{ tuple $envAll "horizon" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{ .Values.labels.dashboard.node_selector_key }}: {{ .Values.labels.dashboard.node_selector_value }}
|
{{ .Values.labels.dashboard.node_selector_key }}: {{ .Values.labels.dashboard.node_selector_value }}
|
||||||
|
{{ if $envAll.Values.pod.tolerations.horizon.enabled }}
|
||||||
|
{{ tuple $envAll "horizon" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }}
|
||||||
|
{{ end }}
|
||||||
terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.horizon.timeout | default "30" }}
|
terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.horizon.timeout | default "30" }}
|
||||||
initContainers:
|
initContainers:
|
||||||
{{ tuple $envAll "dashboard" $mounts_horizon_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
{{ tuple $envAll "dashboard" $mounts_horizon_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||||
|
@ -18,5 +18,8 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.certificates -}}
|
{{- if .Values.manifests.certificates -}}
|
||||||
{{- $_ := set $dbDropJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}}
|
{{- $_ := set $dbDropJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
{{- if .Values.pod.tolerations.horizon.enabled -}}
|
||||||
|
{{- $_ := set $dbDropJob "tolerationsEnabled" true -}}
|
||||||
|
{{- end -}}
|
||||||
{{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }}
|
{{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -18,5 +18,8 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.certificates -}}
|
{{- if .Values.manifests.certificates -}}
|
||||||
{{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}}
|
{{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
{{- if .Values.pod.tolerations.horizon.enabled -}}
|
||||||
|
{{- $_ := set $dbInitJob "tolerationsEnabled" true -}}
|
||||||
|
{{- end -}}
|
||||||
{{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }}
|
{{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -42,6 +42,9 @@ spec:
|
|||||||
restartPolicy: OnFailure
|
restartPolicy: OnFailure
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
|
{{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
|
||||||
|
{{ if $envAll.Values.pod.tolerations.horizon.enabled }}
|
||||||
|
{{ tuple $envAll "horizon" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }}
|
||||||
|
{{ end }}
|
||||||
initContainers:
|
initContainers:
|
||||||
{{ tuple $envAll "db_sync" $mounts_horizon_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
{{ tuple $envAll "db_sync" $mounts_horizon_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||||
containers:
|
containers:
|
||||||
|
@ -14,5 +14,8 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }}
|
{{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }}
|
||||||
{{- $imageRepoSyncJob := dict "envAll" . "serviceName" "horizon" -}}
|
{{- $imageRepoSyncJob := dict "envAll" . "serviceName" "horizon" -}}
|
||||||
|
{{- if .Values.pod.tolerations.horizon.enabled -}}
|
||||||
|
{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}}
|
||||||
|
{{- end -}}
|
||||||
{{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }}
|
{{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -35,6 +35,9 @@ spec:
|
|||||||
{{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
|
{{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
|
||||||
restartPolicy: Never
|
restartPolicy: Never
|
||||||
serviceAccountName: {{ $serviceAccountName }}
|
serviceAccountName: {{ $serviceAccountName }}
|
||||||
|
{{ if $envAll.Values.pod.tolerations.horizon.enabled }}
|
||||||
|
{{ tuple $envAll "horizon" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }}
|
||||||
|
{{ end }}
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
{{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
|
{{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
|
||||||
initContainers:
|
initContainers:
|
||||||
|
@ -1129,6 +1129,13 @@ pod:
|
|||||||
default: kubernetes.io/hostname
|
default: kubernetes.io/hostname
|
||||||
weight:
|
weight:
|
||||||
default: 10
|
default: 10
|
||||||
|
tolerations:
|
||||||
|
horizon:
|
||||||
|
enabled: false
|
||||||
|
tolerations:
|
||||||
|
- key: node-role.kubernetes.io/master
|
||||||
|
operator: Exists
|
||||||
|
effect: NoSchedule
|
||||||
mounts:
|
mounts:
|
||||||
horizon_db_init:
|
horizon_db_init:
|
||||||
init_container: null
|
init_container: null
|
||||||
|
@ -27,4 +27,5 @@ horizon:
|
|||||||
- 0.2.15 Add local_settings.d
|
- 0.2.15 Add local_settings.d
|
||||||
- 0.2.16 Fix container-infra value
|
- 0.2.16 Fix container-infra value
|
||||||
- 0.2.17 Add custom logo
|
- 0.2.17 Add custom logo
|
||||||
|
- 0.2.18 Enable taint toleration for Openstack services
|
||||||
...
|
...
|
||||||
|
Loading…
Reference in New Issue
Block a user