Merge branch 'master' into fix/querier-empty-env

Author: kd7lxl

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## master / unreleased
 
 * [BUGFIX] Querier: avoid rendering empty `env:` key when no env vars are set
+* [BUGFIX] Ruler: fix sidecar securityContext using main container's condition instead of sidecar's
 
 ## 3.3.4 / 2026-06-23
 

templates/ruler/ruler-dep.yaml

@@ -108,7 +108,7 @@ spec:
           {{- end }}
           resources:
             {{- toYaml .Values.ruler.sidecar.resources | nindent 12 }}
-          {{- if .Values.ruler.containerSecurityContext.enabled }}
+          {{- if .Values.ruler.sidecar.containerSecurityContext.enabled }}
           securityContext: {{- omit .Values.ruler.sidecar.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
           volumeMounts: