[CI/CD] Automated Update

Update yaml file `./production/helm/loki/values.yaml` Update helm chart in `production/helm/loki` folder ci_link: https://drone.grafana.net/grafana/enterprise-logs/8668/1/5 commit_link: https://github.com/grafana/enterprise-logs/compare/v3.1.1 repo: grafana/enterprise-logs Signed-off-by: Vladyslav Diachenko <[email protected]>
grafana · Aug 9, 2024 · 6ad9404 · 6ad9404
1 parent 66d7138
commit 6ad9404
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
@@ -2640,7 +2640,7 @@ null
     "tolerations": []
   },
   "useExternalLicense": false,
-  "version": "3.1.0"
+  "version": "3.1.1"
 }
 </pre>
 </td>
@@ -5689,6 +5689,7 @@ null
   "s3": {
     "accessKeyId": null,
     "backoff_config": {},
+    "disable_dualstack": false,
     "endpoint": null,
     "http_config": {},
     "insecure": false,

diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
@@ -13,6 +13,13 @@ Entries should include a reference to the pull request that introduced the chang
 
 [//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
 
+## 6.10.0
+
+- [CHANGE] Changed version of Grafana Enterprise Logs to 3.1.1
+- [CHANGE] Changed version of Grafana Loki to 3.1.1
+- [ENHANCEMENT] Added ability to disable AWS S3 dualstack endpoint usage.
+
+
 ## 6.9.0
 
 - [BUGFIX] Fixed how we set imagePullSecrets for the memcached and provisioner.

diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: loki
 description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 type: application
-appVersion: 3.1.0
-version: 6.9.0
+appVersion: 3.1.1
+version: 6.10.0
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki

diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
 # loki
 
-![Version: 6.9.0](https://img.shields.io/badge/Version-6.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
+![Version: 6.10.0](https://img.shields.io/badge/Version-6.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square)
 
 Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
 

diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl
@@ -237,6 +237,9 @@ s3:
   {{- end }}
   s3forcepathstyle: {{ .s3ForcePathStyle }}
   insecure: {{ .insecure }}
+  {{- with .disable_dualstack }}
+  disable_dualstack: {{ . }}
+  {{- end }}
   {{- with .http_config}}
   http_config:
 {{ toYaml . | indent 4 }}

diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
@@ -329,6 +329,7 @@ loki:
       http_config: {}
       # -- Check https://grafana.com/docs/loki/latest/configure/#s3_storage_config for more info on how to provide a backoff_config
       backoff_config: {}
+      disable_dualstack: false
     gcs:
       chunkBufferSize: 0
       requestTimeout: "0s"
@@ -450,7 +451,7 @@ enterprise:
   # Enable enterprise features, license must be provided
   enabled: false
   # Default verion of GEL to deploy
-  version: 3.1.0
+  version: 3.1.1
   # -- Optional name of the GEL cluster, otherwise will use .Release.Name
   # The cluster name must match what is in your GEL license
   cluster_name: null
@@ -1012,9 +1013,11 @@ gateway:
     htpasswd: >-
       {{ if .Values.loki.tenants }}
 
+
         {{- range $t := .Values.loki.tenants }}
       {{ htpasswd (required "All tenants must have a 'name' set" $t.name) (required "All tenants must have a 'password' set" $t.password) }}
 
+
         {{- end }}
       {{ else }} {{ htpasswd (required "'gateway.basicAuth.username' is required" .Values.gateway.basicAuth.username) (required "'gateway.basicAuth.password' is required" .Values.gateway.basicAuth.password) }} {{ end }}
     # -- Existing basic auth secret to use. Must contain '.htpasswd'