From 54b3cd2b26aa3d7cbc411df8aeb3785ae2991a63 Mon Sep 17 00:00:00 2001
From: Benoit Schipper <77777295+benoitschipper@users.noreply.github.com>
Date: Mon, 15 Jan 2024 21:33:23 +0100
Subject: [PATCH 1/3] Update values.yaml documentation and example

The documentation on the website was not that clear and it took us a while in order to find the http insecure_skip_verify option. Therefore we thought an Example would be good for future reference.
---
 .../helm/charts/mimir-distributed/values.yaml    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
index 81a627af4e4..78009db1368 100644
--- a/operations/helm/charts/mimir-distributed/values.yaml
+++ b/operations/helm/charts/mimir-distributed/values.yaml
@@ -412,6 +412,22 @@ mimir:
   # -- Additional structured values on top of the text based 'mimir.config'. Applied after the text based config is evaluated for templates. Enables adding and modifying YAML elements in the evaulated 'mimir.config'.
   structuredConfig: {}
 
+  # Example
+  # See also the optional "insecure_skip_verify" key below, it allows you to skip_verify_false in case the s3_endpoint certificate is not trusted.
+  # For more information see https://grafana.com/docs/mimir/latest/references/configuration-parameters/
+  #
+  # structuredConfig:
+  #   common:
+  #     storage:
+  #       backend: s3
+  #       s3:
+  #         bucket_name: "${BUCKET_NAME}"
+  #         endpoint: "${BUCKET_HOST}:${BUCKET_PORT}"
+  #         access_key_id: "${AWS_ACCESS_KEY_ID}" # This is a secret injected via an environment variable
+  #         secret_access_key: "${AWS_SECRET_ACCESS_KEY}" # This is a secret injected via an environment variable
+  #         http: 
+  #           insecure_skip_verify: true
+
 # -- runtimeConfig provides a reloadable runtime configuration. Changing the runtimeConfig doesn't require a restart of all components.
 # For more infromation see https://grafana.com/docs/mimir/latest/configure/about-runtime-configuration/
 #

From 5813c5de153e33058093de503cbb4bdb6e421e03 Mon Sep 17 00:00:00 2001
From: Benoit Schipper <77777295+benoitschipper@users.noreply.github.com>
Date: Wed, 17 Jan 2024 08:12:45 +0000
Subject: [PATCH 2/3] fix docs for helm doc compatability

---
 operations/helm/charts/mimir-distributed/values.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
index 78009db1368..c0b3f06d87b 100644
--- a/operations/helm/charts/mimir-distributed/values.yaml
+++ b/operations/helm/charts/mimir-distributed/values.yaml
@@ -410,12 +410,12 @@ mimir:
     {{- end}}
 
   # -- Additional structured values on top of the text based 'mimir.config'. Applied after the text based config is evaluated for templates. Enables adding and modifying YAML elements in the evaulated 'mimir.config'.
-  structuredConfig: {}
-
-  # Example
-  # See also the optional "insecure_skip_verify" key below, it allows you to skip_verify_false in case the s3_endpoint certificate is not trusted.
+  # 
+  # Additionally, consider the optional "insecure_skip_verify" key below, it allows you to skip_verify_false in case the s3_endpoint certificate is not trusted.
   # For more information see https://grafana.com/docs/mimir/latest/references/configuration-parameters/
   #
+  # Example:
+  #
   # structuredConfig:
   #   common:
   #     storage:
@@ -427,6 +427,7 @@ mimir:
   #         secret_access_key: "${AWS_SECRET_ACCESS_KEY}" # This is a secret injected via an environment variable
   #         http: 
   #           insecure_skip_verify: true
+  structuredConfig: {}
 
 # -- runtimeConfig provides a reloadable runtime configuration. Changing the runtimeConfig doesn't require a restart of all components.
 # For more infromation see https://grafana.com/docs/mimir/latest/configure/about-runtime-configuration/

From e8d7ac7df6b73b8c328d2e923df88b114eab3be9 Mon Sep 17 00:00:00 2001
From: Benoit Schipper <77777295+benoitschipper@users.noreply.github.com>
Date: Thu, 18 Jan 2024 06:24:03 +0000
Subject: [PATCH 3/3] fixing trailing spaces

---
 operations/helm/charts/mimir-distributed/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
index c0b3f06d87b..9097b76831d 100644
--- a/operations/helm/charts/mimir-distributed/values.yaml
+++ b/operations/helm/charts/mimir-distributed/values.yaml
@@ -410,7 +410,7 @@ mimir:
     {{- end}}
 
   # -- Additional structured values on top of the text based 'mimir.config'. Applied after the text based config is evaluated for templates. Enables adding and modifying YAML elements in the evaulated 'mimir.config'.
-  # 
+  #
   # Additionally, consider the optional "insecure_skip_verify" key below, it allows you to skip_verify_false in case the s3_endpoint certificate is not trusted.
   # For more information see https://grafana.com/docs/mimir/latest/references/configuration-parameters/
   #
@@ -425,7 +425,7 @@ mimir:
   #         endpoint: "${BUCKET_HOST}:${BUCKET_PORT}"
   #         access_key_id: "${AWS_ACCESS_KEY_ID}" # This is a secret injected via an environment variable
   #         secret_access_key: "${AWS_SECRET_ACCESS_KEY}" # This is a secret injected via an environment variable
-  #         http: 
+  #         http:
   #           insecure_skip_verify: true
   structuredConfig: {}