diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index d504e4ee31b52..8dae6eced0bfa 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -1,5 +1,6 @@ ## Main +- [12008](https://github.com/grafana/loki/pull/12008) **xperimental**: Support using multiple buckets with AWS STS - [11964](https://github.com/grafana/loki/pull/11964) **xperimental**: Provide Azure region for managed credentials using environment variable - [11920](https://github.com/grafana/loki/pull/11920) **xperimental**: Refactor handling of credentials in managed-auth mode - [11869](https://github.com/grafana/loki/pull/11869) **periklis**: Add support for running with Google Workload Identity diff --git a/operator/internal/manifests/internal/config/build_test.go b/operator/internal/manifests/internal/config/build_test.go index 187dc6514202a..602672c813bf1 100644 --- a/operator/internal/manifests/internal/config/build_test.go +++ b/operator/internal/manifests/internal/config/build_test.go @@ -5436,7 +5436,8 @@ func TestBuild_ConfigAndRuntimeConfig_STS(t *testing.T) { } expStorageConfig := ` s3: - s3: s3://my-region/my-bucket + bucketnames: my-bucket + region: my-region s3forcepathstyle: false` expCfg := ` diff --git a/operator/internal/manifests/internal/config/loki-config.yaml b/operator/internal/manifests/internal/config/loki-config.yaml index f908253a0c228..5d729eaffaf9e 100644 --- a/operator/internal/manifests/internal/config/loki-config.yaml +++ b/operator/internal/manifests/internal/config/loki-config.yaml @@ -29,7 +29,8 @@ common: {{- with .ObjectStorage.S3 }} s3: {{- if .STS }} - s3: "s3://{{.Region}}/{{.Buckets}}" + bucketnames: {{.Buckets}} + region: {{.Region}} s3forcepathstyle: false {{- else }} s3: {{ .Endpoint }}