diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml index 95d9797fd922ea4761c52d77619308a15c392302..982dae1aa13c0a0a2ff70c9341d31878190cc8e7 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 6eeaacb9c0e84c26a8df4712fa6d7ba2affbed32..a353268eaab1e484f279698f0f3dc74cdc870ba5 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 b2fae2d4d30f2b551cd0441ed6f1ea780d93d422..550d2d50be0506712c6bcbea4ff69391c283bdc4 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"