From 4eff195cc0e0f99de8a043aab8ea2bc2294c45aa Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <brtknr@bath.edu>
Date: Thu, 21 Nov 2019 14:18:47 +0000
Subject: [PATCH] Bump up prometheus operator chart to 8.2.2

Without this, deployment fails on 1.16.x due to deprecated APIs.

Story: 2006853
Task: 37577

Change-Id: I6dd1fa4649bc2b8d06abd28ae3aa9259b384d171
---
 .../common/templates/kubernetes/helm/prometheus-operator.sh  | 4 +---
 .../drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml  | 2 +-
 .../drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml  | 2 +-
 ...s-operator-compatible-with-k8s-1-16-f8be99cf527075b8.yaml | 5 +++++
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/prometheus-operator-compatible-with-k8s-1-16-f8be99cf527075b8.yaml

diff --git a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
index 9a49f6e7ab..8e32b8d483 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
@@ -10,8 +10,6 @@ printf "Starting to run ${step}\n"
 ### Configuration
 ###############################################################################
 CHART_NAME="prometheus-operator"
-CHART_VERSION=${PROMETHEUS_OPERATOR_CHART_TAG:-5.12.3}
-
 
 if [ "$(echo ${MONITORING_ENABLED} | tr '[:upper:]' '[:lower:]')" = "true" ]; then
 
@@ -64,7 +62,7 @@ data:
         exit 0
     else
         # TODO: Set namespace to monitoring. This is needed as the Kubernetes default priorityClass can only be used in NS kube-system
-        helm install stable/${CHART_NAME} --namespace kube-system --name ${CHART_NAME} --version v${CHART_VERSION} --values /opt/magnum/install-${CHART_NAME}-values.yaml
+        helm install stable/${CHART_NAME} --namespace kube-system --name ${CHART_NAME} --version ${PROMETHEUS_OPERATOR_CHART_TAG} --values /opt/magnum/install-${CHART_NAME}-values.yaml
     fi
 
   install-${CHART_NAME}-values.yaml:  |
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
index b1b71617ca..0c0541b69f 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
@@ -664,7 +664,7 @@ parameters:
   prometheus_operator_chart_tag:
     type: string
     description: The stable/prometheus-operator chart version to use.
-    default: 5.12.3
+    default: v8.2.2
 
   project_id:
     type: string
diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
index 2055914108..8f0368f36a 100644
--- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
+++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
@@ -664,7 +664,7 @@ parameters:
   prometheus_operator_chart_tag:
     type: string
     description: The stable/prometheus-operator chart version to use.
-    default: 5.12.3
+    default: v8.2.2
 
   project_id:
     type: string
diff --git a/releasenotes/notes/prometheus-operator-compatible-with-k8s-1-16-f8be99cf527075b8.yaml b/releasenotes/notes/prometheus-operator-compatible-with-k8s-1-16-f8be99cf527075b8.yaml
new file mode 100644
index 0000000000..2f692774c7
--- /dev/null
+++ b/releasenotes/notes/prometheus-operator-compatible-with-k8s-1-16-f8be99cf527075b8.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Bump up prometheus operator chart version to 8.2.2 so that it is compatible
+    with k8s 1.16.x.