From 07115801545c272f4f3428fdedcdc52f9badac99 Mon Sep 17 00:00:00 2001 From: ZhenYi Liang Date: Fri, 30 Jun 2023 14:53:03 +0800 Subject: [PATCH] helm: support endpoint_suffix for azure storage (#9791) **What this PR does / why we need it**: According the [official document](https://grafana.com/docs/loki/latest/storage/#using-account-name-and-key), support storage_config.azure.endpoint_suffix, example blob.core.chinacloudapi.cn **Which issue(s) this PR fixes**: Fixes # **Special notes for your reviewer**: **Checklist** - [X] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [ ] Tests updated - [x] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/upgrading/_index.md` - [x] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](https://github.com/grafana/loki/commit/d10549e3ece02120974929894ee333d07755d213) --------- Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com> Co-authored-by: J Stickler --- docs/sources/installation/helm/reference.md | 1 + production/helm/loki/CHANGELOG.md | 4 ++++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- production/helm/loki/templates/_helpers.tpl | 6 ++++++ production/helm/loki/values.yaml | 1 + 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/sources/installation/helm/reference.md b/docs/sources/installation/helm/reference.md index 8b20f78674..df6af712a1 100644 --- a/docs/sources/installation/helm/reference.md +++ b/docs/sources/installation/helm/reference.md @@ -2107,6 +2107,7 @@ null "azure": { "accountKey": null, "accountName": null, + "endpointSuffix": null, "requestTimeout": null, "useFederatedToken": false, "useManagedIdentity": false, diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 207f46c635..4bfcc93758 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : 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.) +## 5.8.8 + +- [ENHANCEMENT] Add loki.storage.azure.endpointSuffix to support Azure private endpoint + ## 5.8.7 - [BUGFIX] Remove persistentVolumeClaimRetentionPolicy from single-binary StatefulSet when persistence is disabled diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 7538606d23..07adcc2c36 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,7 +3,7 @@ name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application appVersion: 2.8.2 -version: 5.8.7 +version: 5.8.8 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 index ff18d33a86..59882675f6 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.8.7](https://img.shields.io/badge/Version-5.8.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square) +![Version: 5.8.8](https://img.shields.io/badge/Version-5.8.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.2](https://img.shields.io/badge/AppVersion-2.8.2-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl index 48aacf3718..90bd927012 100644 --- a/production/helm/loki/templates/_helpers.tpl +++ b/production/helm/loki/templates/_helpers.tpl @@ -270,6 +270,9 @@ azure: {{- with .requestTimeout }} request_timeout: {{ . }} {{- end }} + {{- with .endpointSuffix }} + endpoint_suffix: {{ . }} + {{- end }} {{- end -}} {{- else -}} {{- with .Values.loki.storage.filesystem }} @@ -337,6 +340,9 @@ azure: {{- with .requestTimeout }} request_timeout: {{ . }} {{- end }} + {{- with .endpointSuffix }} + endpoint_suffix: {{ . }} + {{- end }} {{- end -}} {{- else }} type: "local" diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index d0e291a138..67e4aac2e8 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -283,6 +283,7 @@ loki: useFederatedToken: false userAssignedId: null requestTimeout: null + endpointSuffix: null filesystem: chunks_directory: /var/loki/chunks rules_directory: /var/loki/rules