Merge "Heat: Add rolling update strategy"

This commit is contained in:
Jenkins 2017-04-23 11:03:10 +00:00 committed by Gerrit Code Review
commit 2ecfb8f991
4 changed files with 31 additions and 0 deletions

View File

@ -22,6 +22,14 @@ metadata:
name: heat-api name: heat-api
spec: spec:
replicas: {{ .Values.replicas.api }} replicas: {{ .Values.replicas.api }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }}
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -22,6 +22,14 @@ metadata:
name: heat-cfn name: heat-cfn
spec: spec:
replicas: {{ .Values.replicas.cfn }} replicas: {{ .Values.replicas.cfn }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }}
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -22,6 +22,14 @@ metadata:
name: heat-cloudwatch name: heat-cloudwatch
spec: spec:
replicas: {{ .Values.replicas.cloudwatch }} replicas: {{ .Values.replicas.cloudwatch }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }}
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

View File

@ -41,6 +41,13 @@ images:
dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
upgrades:
revision_history: 3
pod_replacement_strategy: RollingUpdate
rolling_update:
max_unavailable: 1
max_surge: 3
keystone_secrets: keystone_secrets:
admin: "heat-env-keystone-admin" admin: "heat-env-keystone-admin"
user: "heat-env-keystone-user" user: "heat-env-keystone-user"