Merge "Bump up prometheus operator chart to 8.2.2"

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:  |

magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml

@@ -669,7 +669,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
 
   prometheus_adapter_enabled:
     type: boolean

magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

@@ -669,7 +669,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
 
   prometheus_adapter_enabled:
     type: boolean

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.