From 1971d23da8304fdb6cd34091f448928cd1973369 Mon Sep 17 00:00:00 2001
From: Steven Fitzpatrick <steven.fitzpatrick@att.com>
Date: Thu, 19 Sep 2019 10:33:29 -0500
Subject: [PATCH] Make corrections to pod lifecycle upgrade values

It was observed in some charts' values.yaml that the values defining
lifecycle upgrade parameters were incorrectly placed.

This change aims to correct these instances by adding a deployment-
type subkey corresponding with the deployment types identified in
the chart's templates dir, and indenting the values appropriately.

Change-Id: Id5437b1eeaf6e71472520f1fee91028c9b6bfdd3
---
 nagios/values.yaml                        | 11 ++++++-----
 prometheus-alertmanager/values.yaml       |  7 ++-----
 prometheus-kube-state-metrics/values.yaml | 11 ++++++-----
 prometheus-node-exporter/values.yaml      |  6 +-----
 prometheus-openstack-exporter/values.yaml | 11 ++++++-----
 prometheus-process-exporter/values.yaml   |  6 +-----
 prometheus/values.yaml                    |  7 ++-----
 7 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/nagios/values.yaml b/nagios/values.yaml
index 8b88bb324d..9d251985f2 100644
--- a/nagios/values.yaml
+++ b/nagios/values.yaml
@@ -229,11 +229,12 @@ pod:
         default: 10
   lifecycle:
     upgrades:
-      revision_history: 3
-      pod_replacement_strategy: RollingUpdate
-      rolling_update:
-        max_unavailable: 1
-        max_surge: 3
+      deployments:
+        revision_history: 3
+        pod_replacement_strategy: RollingUpdate
+        rolling_update:
+          max_unavailable: 1
+          max_surge: 3
     termination_grace_period:
       nagios:
         timeout: 30
diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml
index 87c2ed28b7..6f08545e08 100644
--- a/prometheus-alertmanager/values.yaml
+++ b/prometheus-alertmanager/values.yaml
@@ -65,11 +65,8 @@ pod:
     alertmanager: 1
   lifecycle:
     upgrades:
-      revision_history: 3
-      pod_replacement_strategy: RollingUpdate
-      rolling_update:
-        max_unavailable: 1
-        max_surge: 3
+      statefulsets:
+        pod_replacement_strategy: RollingUpdate
     termination_grace_period:
       alertmanager:
         timeout: 30
diff --git a/prometheus-kube-state-metrics/values.yaml b/prometheus-kube-state-metrics/values.yaml
index 0f88f7b036..063b8b269e 100644
--- a/prometheus-kube-state-metrics/values.yaml
+++ b/prometheus-kube-state-metrics/values.yaml
@@ -61,11 +61,12 @@ pod:
     kube_state_metrics: 1
   lifecycle:
     upgrades:
-      revision_history: 3
-      pod_replacement_strategy: RollingUpdate
-      rolling_update:
-        max_unavailable: 1
-        max_surge: 3
+      deployments:
+        revision_history: 3
+        pod_replacement_strategy: RollingUpdate
+        rolling_update:
+          max_unavailable: 1
+          max_surge: 3
     termination_grace_period:
       kube_state_metrics:
         timeout: 30
diff --git a/prometheus-node-exporter/values.yaml b/prometheus-node-exporter/values.yaml
index d2913d8c9b..7f0140e4ed 100644
--- a/prometheus-node-exporter/values.yaml
+++ b/prometheus-node-exporter/values.yaml
@@ -62,11 +62,7 @@ pod:
         node_exporter:
           enabled: true
           min_ready_seconds: 0
-      revision_history: 3
-      pod_replacement_strategy: RollingUpdate
-      rolling_update:
-        max_unavailable: 1
-        max_surge: 3
+          max_unavailable: 1
     termination_grace_period:
       node_exporter:
         timeout: 30
diff --git a/prometheus-openstack-exporter/values.yaml b/prometheus-openstack-exporter/values.yaml
index 9d38b3504e..ee84560a89 100644
--- a/prometheus-openstack-exporter/values.yaml
+++ b/prometheus-openstack-exporter/values.yaml
@@ -67,11 +67,12 @@ pod:
     prometheus_openstack_exporter: 1
   lifecycle:
     upgrades:
-      revision_history: 3
-      pod_replacement_strategy: RollingUpdate
-      rolling_update:
-        max_unavailable: 1
-        max_surge: 3
+      deployments:
+        revision_history: 3
+        pod_replacement_strategy: RollingUpdate
+        rolling_update:
+          max_unavailable: 1
+          max_surge: 3
     termination_grace_period:
       prometheus_openstack_exporter:
         timeout: 30
diff --git a/prometheus-process-exporter/values.yaml b/prometheus-process-exporter/values.yaml
index fa7416849b..64474ccf32 100644
--- a/prometheus-process-exporter/values.yaml
+++ b/prometheus-process-exporter/values.yaml
@@ -64,11 +64,7 @@ pod:
         process_exporter:
           enabled: true
           min_ready_seconds: 0
-      revision_history: 3
-      pod_replacement_strategy: RollingUpdate
-      rolling_update:
-        max_unavailable: 1
-        max_surge: 3
+          max_unavailable: 1
     termination_grace_period:
       process_exporter:
         timeout: 30
diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index a27d413798..b13223dacd 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -73,11 +73,8 @@ pod:
     prometheus: 1
   lifecycle:
     upgrades:
-      revision_history: 3
-      pod_replacement_strategy: RollingUpdate
-      rolling_update:
-        max_unavailable: 1
-        max_surge: 3
+      statefulsets:
+        pod_replacement_strategy: RollingUpdate
     termination_grace_period:
       prometheus:
         timeout: 30