diff --git a/docs/sources/installation/helm/reference.md b/docs/sources/installation/helm/reference.md
index 963784d28c..924aa0c688 100644
--- a/docs/sources/installation/helm/reference.md
+++ b/docs/sources/installation/helm/reference.md
@@ -337,6 +337,15 @@ false
null
+ |
+
+
+ | enterprise.image.digest |
+ string |
+ Overrides the image tag with an image digest |
+
+null
+
|
@@ -398,6 +407,7 @@ null
"env": [],
"extraVolumeMounts": [],
"image": {
+ "digest": null,
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/enterprise-logs-provisioner",
@@ -467,12 +477,22 @@ true
| Provisioner image to Utilize |
{
+ "digest": null,
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/enterprise-logs-provisioner",
"tag": null
}
+ |
+
+
+ | enterprise.provisioner.image.digest |
+ string |
+ Overrides the image tag with an image digest |
+
+null
+
|
@@ -907,6 +927,15 @@ true
[]
+ |
+
+
+ | gateway.image.digest |
+ string |
+ Overrides the gateway image tag with an image digest |
+
+null
+
|
@@ -1531,6 +1560,15 @@ false
[]
+ |
+
+
+ | kubectlImage.digest |
+ string |
+ Overrides the image tag with an image digest |
+
+null
+
|
@@ -1651,6 +1689,15 @@ true
""
+ |
+
+
+ | loki.image.digest |
+ string |
+ Overrides the image tag with an image digest |
+
+null
+
|
@@ -2142,12 +2189,22 @@ true
| Image to use for loki canary |
{
+ "digest": null,
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/loki-canary",
"tag": null
}
+ |
+
+
+ | monitoring.lokiCanary.image.digest |
+ string |
+ Overrides the image tag with an image digest |
+
+null
+
|
@@ -3481,6 +3538,7 @@ null
"annotations": {},
"enabled": true,
"image": {
+ "digest": null,
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/loki-helm-test",
@@ -3508,12 +3566,22 @@ null
| Image to use for loki canary |
{
+ "digest": null,
"pullPolicy": "IfNotPresent",
"registry": "docker.io",
"repository": "grafana/loki-helm-test",
"tag": null
}
+ |
+
+
+ | test.image.digest |
+ string |
+ Overrides the image tag with an image digest |
+
+null
+
|
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index b8270c071a..19a91d6059 100644
--- a/production/helm/loki/CHANGELOG.md
+++ b/production/helm/loki/CHANGELOG.md
@@ -13,6 +13,11 @@ 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.5.1
+
+- [FEATURE] Added ability to reference images by digest
+
## 5.5.0
- [CHANGE] Changed version of Grafana Enterprise Logs to v1.7.2
diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index a279716899..f2c73c9020 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.5.0
+version: 5.5.1
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 35e10be993..7af27cd718 100644
--- a/production/helm/loki/README.md
+++ b/production/helm/loki/README.md
@@ -1,6 +1,6 @@
# loki
-  
+  
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 520a73c20f..ffbc7b952c 100644
--- a/production/helm/loki/templates/_helpers.tpl
+++ b/production/helm/loki/templates/_helpers.tpl
@@ -135,11 +135,11 @@ Base template for building docker image reference
{{- define "loki.baseImage" }}
{{- $registry := .global.registry | default .service.registry | default "" -}}
{{- $repository := .service.repository | default "" -}}
-{{- $tag := .service.tag | default .defaultVersion | toString -}}
+{{- $ref := ternary (printf ":%s" (.service.tag | default .defaultVersion | toString)) (printf "@%s" .service.digest) (empty .service.digest) -}}
{{- if and $registry $repository -}}
- {{- printf "%s/%s:%s" $registry $repository $tag -}}
+ {{- printf "%s/%s%s" $registry $repository $ref -}}
{{- else -}}
- {{- printf "%s%s:%s" $registry $repository $tag -}}
+ {{- printf "%s%s%s" $registry $repository $ref -}}
{{- end -}}
{{- end -}}
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 14fade0a14..1191e0bff5 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -23,6 +23,8 @@ kubectlImage:
repository: bitnami/kubectl
# -- Overrides the image tag whose default is the chart's appVersion
tag: null
+ # -- Overrides the image tag with an image digest
+ digest: null
# -- Docker image pull policy
pullPolicy: IfNotPresent
loki:
@@ -42,6 +44,8 @@ loki:
# TODO: needed for 3rd target backend functionality
# revert to null or latest once this behavior is relased
tag: null
+ # -- Overrides the image tag with an image digest
+ digest: null
# -- Docker image pull policy
pullPolicy: IfNotPresent
# -- Common annotations for all pods
@@ -340,6 +344,8 @@ enterprise:
repository: grafana/enterprise-logs
# -- Docker image tag
tag: null
+ # -- Overrides the image tag with an image digest
+ digest: null
# -- Docker image pull policy
pullPolicy: IfNotPresent
adminToken:
@@ -415,6 +421,8 @@ enterprise:
repository: grafana/enterprise-logs-provisioner
# -- Overrides the image tag whose default is the chart's appVersion
tag: null
+ # -- Overrides the image tag with an image digest
+ digest: null
# -- Docker image pull policy
pullPolicy: IfNotPresent
# -- Volume mounts to add to the provisioner pods
@@ -467,6 +475,8 @@ test:
repository: grafana/loki-helm-test
# -- Overrides the image tag whose default is the chart's appVersion
tag: null
+ # -- Overrides the image tag with an image digest
+ digest: null
# -- Docker image pull policy
pullPolicy: IfNotPresent
# Monitoring section determines which monitoring features to enable
@@ -606,6 +616,8 @@ monitoring:
repository: grafana/loki-canary
# -- Overrides the image tag whose default is the chart's appVersion
tag: null
+ # -- Overrides the image tag with an image digest
+ digest: null
# -- Docker image pull policy
pullPolicy: IfNotPresent
# Configuration for the write pod(s)
@@ -1034,6 +1046,8 @@ gateway:
repository: nginxinc/nginx-unprivileged
# -- The gateway image tag
tag: 1.19-alpine
+ # -- Overrides the gateway image tag with an image digest
+ digest: null
# -- The gateway image pull policy
pullPolicy: IfNotPresent
# -- The name of the PriorityClass for gateway pods