openstack/openstack-helm
Code Issues Proposed changes

Merge "Introduce rolling updates for daemonsets"

Browse Source
This commit is contained in:
Jenkins 2017-07-04 22:17:06 +00:00 committed by Gerrit Code Review
commit 6231dde5c1
16 changed files with 150 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/templates/daemonset-dhcp-agent.yaml
View File

@ -22,6 +22,15 @@ kind: DaemonSet
metadata: metadata:
name: neutron-dhcp-agent name: neutron-dhcp-agent
spec: spec:
{{ if .Values.upgrades.daemonsets.dhcp_agent.enabled }}
minReadySeconds: {{ .Values.upgrades.daemonsets.dhcp_agent.min_ready_seconds }}
updateStrategy:
type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
{{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.daemonsets.dhcp_agent.max_unavailable }}
{{ end }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

9
neutron/templates/daemonset-l3-agent.yaml
View File

@ -22,6 +22,15 @@ kind: DaemonSet
metadata: metadata:
name: neutron-l3-agent name: neutron-l3-agent
spec: spec:
{{ if .Values.upgrades.daemonsets.l3_agent.enabled }}
minReadySeconds: {{ .Values.upgrades.daemonsets.l3_agent.min_ready_seconds }}
updateStrategy:
type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
{{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.daemonsets.l3_agent.max_unavailable }}
{{ end }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

9
neutron/templates/daemonset-metadata-agent.yaml
View File

@ -22,6 +22,15 @@ kind: DaemonSet
metadata: metadata:
name: neutron-metadata-agent name: neutron-metadata-agent
spec: spec:
{{ if .Values.upgrades.daemonsets.metadata_agent.enabled }}
minReadySeconds: {{ .Values.upgrades.daemonsets.metadata_agent.min_ready_seconds }}
updateStrategy:
type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
{{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.daemonsets.metadata_agent.max_unavailable }}
{{ end }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

9
neutron/templates/daemonset-ovs-agent.yaml
View File

@ -22,6 +22,15 @@ kind: DaemonSet
metadata: metadata:
name: ovs-agent name: ovs-agent
spec: spec:
{{ if .Values.upgrades.daemonsets.ovs_agent.enabled }}
minReadySeconds: {{ .Values.upgrades.daemonsets.ovs_agent.min_ready_seconds }}
updateStrategy:
type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
{{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.daemonsets.ovs_agent.max_unavailable }}
{{ end }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

9
neutron/templates/daemonset-ovs-db.yaml
View File

@ -18,6 +18,15 @@ kind: DaemonSet
metadata: metadata:
name: ovs-db name: ovs-db
spec: spec:
{{ if .Values.upgrades.daemonsets.ovs_db.enabled }}
minReadySeconds: {{ .Values.upgrades.daemonsets.ovs_db.min_ready_seconds }}
updateStrategy:
type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
{{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.daemonsets.ovs_db.max_unavailable }}
{{ end }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

9
neutron/templates/daemonset-ovs-vswitchd.yaml
View File

@ -18,6 +18,15 @@ kind: DaemonSet
metadata: metadata:
name: ovs-vswitchd name: ovs-vswitchd
spec: spec:
{{ if .Values.upgrades.daemonsets.ovs_vswitchd.enabled }}
minReadySeconds: {{ .Values.upgrades.daemonsets.ovs_vswitchd.min_ready_seconds }}
updateStrategy:
type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
{{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.daemonsets.ovs_vswitchd.max_unavailable }}
{{ end }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

10
neutron/templates/deployment-server.yaml
View File

@ -23,13 +23,13 @@ metadata:
name: neutron-server name: neutron-server
spec: spec:
replicas: {{ .Values.replicas.server }} replicas: {{ .Values.replicas.server }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }} {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate: rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
{{ end }} {{ end }}
template: template:
metadata: metadata:

37
neutron/values.yaml
View File

@ -38,11 +38,38 @@ images:
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
upgrades: upgrades:
revision_history: 3 deployments:
pod_replacement_strategy: RollingUpdate revision_history: 3
rolling_update: pod_replacement_strategy: RollingUpdate
max_unavailable: 1 rolling_update:
max_surge: 3 max_unavailable: 1
max_surge: 3
daemonsets:
pod_replacement_strategy: RollingUpdate
dhcp_agent:
enabled: false
min_ready_seconds: 0
max_unavailable: 1
l3_agent:
enabled: false
min_ready_seconds: 0
max_unavailable: 1
metadata_agent:
enabled: true
min_ready_seconds: 0
max_unavailable: 1
ovs_agent:
enabled: true
min_ready_seconds: 0
max_unavailable: 1
ovs_db:
enabled: false
min_ready_seconds: 0
max_unavailable: 1
ovs_vswitchd:
enabled: false
min_ready_seconds: 0
max_unavailable: 1
pod_disruption_budget: pod_disruption_budget:
server: server:

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

@ -22,6 +22,15 @@ kind: DaemonSet
metadata: metadata:
name: nova-compute name: nova-compute
spec: spec:
{{ if .Values.upgrades.daemonsets.compute.enabled }}
minReadySeconds: {{ .Values.upgrades.daemonsets.compute.min_ready_seconds }}
updateStrategy:
type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
{{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.daemonsets.compute.max_unavailable }}
{{ end }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

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

@ -22,6 +22,15 @@ kind: DaemonSet
metadata: metadata:
name: nova-libvirt name: nova-libvirt
spec: spec:
{{ if .Values.upgrades.daemonsets.libvirt.enabled }}
minReadySeconds: {{ .Values.upgrades.daemonsets.libvirt.min_ready_seconds }}
updateStrategy:
type: {{ .Values.upgrades.daemonsets.pod_replacement_strategy }}
{{ if eq .Values.upgrades.daemonsets.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.daemonsets.libvirt.max_unavailable }}
{{ end }}
{{ end }}
template: template:
metadata: metadata:
labels: labels:

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

@ -23,13 +23,13 @@ metadata:
name: nova-api-metadata name: nova-api-metadata
spec: spec:
replicas: {{ .Values.replicas.api_metadata }} replicas: {{ .Values.replicas.api_metadata }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }} {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate: rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
{{ end }} {{ end }}
template: template:
metadata: metadata:

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

@ -23,13 +23,13 @@ metadata:
name: nova-api-osapi name: nova-api-osapi
spec: spec:
replicas: {{ .Values.replicas.osapi }} replicas: {{ .Values.replicas.osapi }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }} {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate: rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
{{ end }} {{ end }}
template: template:
metadata: metadata:

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

@ -23,13 +23,13 @@ metadata:
name: nova-conductor name: nova-conductor
spec: spec:
replicas: {{ .Values.replicas.conductor }} replicas: {{ .Values.replicas.conductor }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }} {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate: rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
{{ end }} {{ end }}
template: template:
metadata: metadata:

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

@ -23,13 +23,13 @@ metadata:
name: nova-consoleauth name: nova-consoleauth
spec: spec:
replicas: {{ .Values.replicas.consoleauth }} replicas: {{ .Values.replicas.consoleauth }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }} {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate: rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
{{ end }} {{ end }}
template: template:
metadata: metadata:

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

@ -23,13 +23,13 @@ metadata:
name: nova-scheduler name: nova-scheduler
spec: spec:
replicas: {{ .Values.replicas.scheduler }} replicas: {{ .Values.replicas.scheduler }}
revisionHistoryLimit: {{ .Values.upgrades.revision_history }} revisionHistoryLimit: {{ .Values.upgrades.deployments.revision_history }}
strategy: strategy:
type: {{ .Values.upgrades.pod_replacement_strategy }} type: {{ .Values.upgrades.deployments.pod_replacement_strategy }}
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }} {{ if eq .Values.upgrades.deployments.pod_replacement_strategy "RollingUpdate" }}
rollingUpdate: rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }} maxUnavailable: {{ .Values.upgrades.deployments.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }} maxSurge: {{ .Values.upgrades.deployments.rolling_update.max_surge }}
{{ end }} {{ end }}
template: template:
metadata: metadata:

21
nova/values.yaml
View File

@ -70,11 +70,22 @@ images:
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
upgrades: upgrades:
revision_history: 3 deployments:
pod_replacement_strategy: RollingUpdate revision_history: 3
rolling_update: pod_replacement_strategy: RollingUpdate
max_unavailable: 1 rolling_update:
max_surge: 3 max_unavailable: 1
max_surge: 3
daemonsets:
pod_replacement_strategy: RollingUpdate
compute:
enabled: true
min_ready_seconds: 0
max_unavailable: 1
libvirt:
enabled: true
min_ready_seconds: 0
max_unavailable: 1
pod_disruption_budget: pod_disruption_budget:
metadata: metadata: