@JStickler can you please review?🙏🏻

We have a different value for 'proxy_set_header' (we allow pushes without a password, but require a password for queries)

Would it be possible to have this as a template variable instead?

Maybe loki.tenants.proxy_set_header?

I'm not sure what your use case, and probably it will be out-of-scoop for the community chart.

this PR is to just fix some regression with the latest changes that broke the tenants option.

@trevorwhitney can we get this fix into the next chart release? 🙏

I'm not sure what your use case, and probably it will be out-of-scoop for the community chart.

this PR is to just fix some regression with the latest changes that broke the tenants option.

Yes, the regression broke the auth (for both me and the regular chart)

My comment was that if you fixed it slightly differently it would make my use case easier.

Instead of having the hardcoded string inside the "if" block, make that string a variable. It benefits the open source chart as well since it means you don't have to worry about updating that string in four different places next time.

#values.yaml
loki.gateway.proxy_set_statement: "proxy_set_header X-Scope-OrgID $remote_user;"

{{ if .Values.loki.tenants }}
{{ .Values.loki.gateway.proxy_set_statement }}

{{ end }}

#16938 also broke configurations that use an existing secret rather than relying on .Values.loki.tenants to build the htpasswd secret.

# Example values.yaml
gateway:
  basicAuth:
    enabled: true
    existingSecret: loki-tenants-htpasswd
  nginxConfig:
    httpSnippet: proxy_set_header X-Scope-OrgID $remote_user;

In my case, I'm manually setting the X-Scope-OrgID using gateway.nginxConfig.httpSnippet, however, it does not look like this PR will restore this use case.