From 1c2e02b0c5c84a4c767e7a8983d3d6a6227b149f Mon Sep 17 00:00:00 2001
From: Ky <ky.truong@digital.justice.gov.uk>
Date: Mon, 11 Mar 2024 11:21:04 +0000
Subject: [PATCH 1/2] :arrow_up:upgrading prometheus stack helm chart

---
 README.md     | 2 +-
 prometheus.tf | 2 +-
 variables.tf  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4763f87..651fc1e 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ module "monitoring" {
 | <a name="input_oidc_components_client_secret"></a> [oidc\_components\_client\_secret](#input\_oidc\_components\_client\_secret) | OIDC ClientSecret used to authenticate to Grafana, AlertManager and Prometheus (oauth2-proxy) | `any` | n/a | yes |
 | <a name="input_oidc_issuer_url"></a> [oidc\_issuer\_url](#input\_oidc\_issuer\_url) | Issuer URL used to authenticate to Grafana, AlertManager and Prometheus (oauth2-proxy) | `any` | n/a | yes |
 | <a name="input_pagerduty_config"></a> [pagerduty\_config](#input\_pagerduty\_config) | Add PagerDuty key to allow integration with a PD service. | `any` | n/a | yes |
-| <a name="input_prometheus_operator_crd_version"></a> [prometheus\_operator\_crd\_version](#input\_prometheus\_operator\_crd\_version) | The version of the prometheus operator crds matching the prometheus chart that is installed in monitoring module | `string` | `"v0.68.0"` | no |
+| <a name="input_prometheus_operator_crd_version"></a> [prometheus\_operator\_crd\_version](#input\_prometheus\_operator\_crd\_version) | The version of the prometheus operator crds matching the prometheus chart that is installed in monitoring module | `string` | `"v0.71.0"` | no |
 | <a name="input_team_name"></a> [team\_name](#input\_team\_name) | n/a | `string` | `"webops"` | no |
 
 ## Outputs
diff --git a/prometheus.tf b/prometheus.tf
index dcd5eda..4b197cb 100644
--- a/prometheus.tf
+++ b/prometheus.tf
@@ -107,7 +107,7 @@ resource "helm_release" "prometheus_operator_eks" {
   repository = "https://prometheus-community.github.io/helm-charts"
   chart      = "kube-prometheus-stack"
   namespace  = kubernetes_namespace.monitoring.id
-  version    = "52.1.0"
+  version    = "56.21.4"
   skip_crds  = true # Crds are managed seperately using resource kubectl_manifest.prometheus_operator_crds
   timeout    = 600
 
diff --git a/variables.tf b/variables.tf
index 2c499d6..22bc8a9 100644
--- a/variables.tf
+++ b/variables.tf
@@ -96,7 +96,7 @@ variable "kibana_upstream" {
 }
 
 variable "prometheus_operator_crd_version" {
-  default     = "v0.68.0"
+  default     = "v0.71.0"
   description = "The version of the prometheus operator crds matching the prometheus chart that is installed in monitoring module"
 }
 

From e7c933aac613da3d2ebb6b70bbb970ee99450cf7 Mon Sep 17 00:00:00 2001
From: Ky <ky.truong@digital.justice.gov.uk>
Date: Mon, 11 Mar 2024 12:11:08 +0000
Subject: [PATCH 2/2] updating values formatting for specifying images repos

---
 templates/prometheus-operator-eks.yaml.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/prometheus-operator-eks.yaml.tpl b/templates/prometheus-operator-eks.yaml.tpl
index a1cc963..14d8b66 100644
--- a/templates/prometheus-operator-eks.yaml.tpl
+++ b/templates/prometheus-operator-eks.yaml.tpl
@@ -255,7 +255,8 @@ grafana:
 
   sidecar:
     image:
-      repository: quay.io/kiwigrid/k8s-sidecar
+      registry: quay.io
+      repository: kiwigrid/k8s-sidecar
     alerts:
       enabled: true
       label: grafana_alert