Merge pull request #97 from alanmeadows/rolling_updates

v1k0d3n · web-flow · commit 7cfe681bd2b2 · 2017-01-10T19:32:49.000-05:00
Consistent Rolling Update Parameters for all Existing Charts
diff --git a/glance/templates/api.yaml b/glance/templates/api.yaml
@@ -4,6 +4,14 @@ metadata:
   name: glance-api
 spec:
   replicas: {{ .Values.replicas }}
+  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:
     metadata:
       labels:
@@ -37,6 +45,7 @@ spec:
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+
       containers:
         - name: glance-api
           image: {{ .Values.images.api }}
diff --git a/glance/values.yaml b/glance/values.yaml
@@ -17,6 +17,13 @@ images:
   post: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   pull_policy: "IfNotPresent"
 
+upgrades:
+  revision_history: 3
+  pod_replacement_strategy: RollingUpdate
+  rolling_update:
+    max_unavailable: 1
+    max_surge: 3
+
 keystone:
   auth_uri: "http://keystone-api:5000"
   auth_url: "http://keystone-api:35357"
diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml
@@ -4,6 +4,14 @@ metadata:
   name: horizon
 spec:
   replicas: {{ .Values.replicas }}
+  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:
     metadata:
       labels:
diff --git a/horizon/values.yaml b/horizon/values.yaml
@@ -10,6 +10,13 @@ images:
   horizon: quay.io/stackanetes/stackanetes-horizon:newton
   pull_policy: "IfNotPresent"
 
+upgrades:
+  revision_history: 3
+  pod_replacement_strategy: RollingUpdate
+  rolling_update:
+    max_unavailable: 1
+    max_surge: 3
+
 labels:
   node_selector_key: openstack-control-plane
   node_selector_value: enabled
diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml
@@ -4,6 +4,14 @@ metadata:
   name: keystone-api
 spec:
   replicas: {{ .Values.replicas }}
+  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:
     metadata:
       labels:
diff --git a/keystone/values.yaml b/keystone/values.yaml
@@ -16,6 +16,13 @@ images:
   entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
   pull_policy: "IfNotPresent"
 
+upgrades:
+  revision_history: 3
+  pod_replacement_strategy: RollingUpdate
+  rolling_update:
+    max_unavailable: 1
+    max_surge: 3
+
 keystone:
   version: v3
   scheme: http
diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml
@@ -4,6 +4,14 @@ metadata:
   name: memcached
 spec:
   replicas: {{ .Values.resources.memcached.replicas }}
+  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:
     metadata:
       labels:
diff --git a/memcached/values.yaml b/memcached/values.yaml
@@ -7,6 +7,13 @@ images:
   memcached: quay.io/stackanetes/stackanetes-memcached:newton
   pull_policy: "IfNotPresent"
 
+upgrades:
+  revision_history: 3
+  pod_replacement_strategy: RollingUpdate
+  rolling_update:
+    max_unavailable: 1
+    max_surge: 3
+
 labels:
   node_selector_key: openstack-control-plane
   node_selector_value: enabled
diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml
@@ -4,6 +4,14 @@ metadata:
   name: neutron-server
 spec:
   replicas: {{ .Values.replicas.server }}
+  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:
     metadata:
       labels:
diff --git a/neutron/values.yaml b/neutron/values.yaml
@@ -20,6 +20,13 @@ images:
   entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.1.0
   pull_policy: "IfNotPresent"
 
+upgrades:
+  revision_history: 3
+  pod_replacement_strategy: RollingUpdate
+  rolling_update:
+    max_unavailable: 1
+    max_surge: 3
+
 labels:
   # ovs is a special case, requiring a special
   # label that can apply to both control hosts
diff --git a/rabbitmq/templates/deployment.yaml b/rabbitmq/templates/deployment.yaml
@@ -4,6 +4,14 @@ metadata:
   name: rabbitmq
 spec:
   replicas: {{ .Values.replicas }}
+  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:
     metadata:
       labels:
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
@@ -8,7 +8,13 @@ replicas: "1" # this must be quoted to deal with atoi
 labels:
   node_selector_key: openstack-control-plane
   node_selector_value: enabled
-
+  
+upgrades:
+  revision_history: 3
+  pod_replacement_strategy: RollingUpdate
+  rolling_update:
+    max_unavailable: 1
+    max_surge: 3
 auth:
   default_user: openstack
   default_pass: password
