From f92ffd5c769106fa55c2aace72cb00546b9eb67c Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Mon, 11 Nov 2019 14:48:35 +0100
Subject: [PATCH] Upgrade to prometheus-operator helmfile version 7.4.0 which
is necessary before upgrading to 8
---
ansible/group_vars/all/oas.yml | 3 +++
ansible/roles/apps/tasks/helmfiles.yml | 2 +-
helmfiles/helmfile.d/15-monitoring.yaml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml
index 95d9797fd..982dae1aa 100644
--- a/ansible/group_vars/all/oas.yml
+++ b/ansible/group_vars/all/oas.yml
@@ -61,3 +61,6 @@ cert_manager:
# the helm chart. See https://hub.helm.sh/charts/jetstack/cert-manager for
# details
crd_version: '0.9'
+
+prometheus:
+ crd_version: 'v0.34.0'
diff --git a/ansible/roles/apps/tasks/helmfiles.yml b/ansible/roles/apps/tasks/helmfiles.yml
index 6eeaacb9c..a353268ea 100644
--- a/ansible/roles/apps/tasks/helmfiles.yml
+++ b/ansible/roles/apps/tasks/helmfiles.yml
@@ -32,7 +32,7 @@
- monitoring
# NOTE: When upgrading prometheus, make sure you sed 0.32.0 to the newest
# appVersion
- command: '/snap/bin/kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/v0.32.0/example/prometheus-operator-crd/{{ item }}'
+ command: '/snap/bin/kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/{{ prometheus.crd_version }}/example/prometheus-operator-crd/{{ item }}'
loop:
- alertmanager.crd.yaml
- prometheus.crd.yaml
diff --git a/helmfiles/helmfile.d/15-monitoring.yaml b/helmfiles/helmfile.d/15-monitoring.yaml
index b2fae2d4d..550d2d50b 100644
--- a/helmfiles/helmfile.d/15-monitoring.yaml
+++ b/helmfiles/helmfile.d/15-monitoring.yaml
@@ -7,7 +7,7 @@ releases:
- name: "oas-{{ .Environment.Values.releaseName }}-prometheus"
namespace: "oas"
chart: "stable/prometheus-operator"
- version: 6.21.0
+ version: "7.4.0"
values:
- "../values/prometheus.yaml.gotmpl"
- "/etc/OpenAppStack/values/apps/prometheus.yaml.gotmpl"
--
GitLab