Skip to content

Commit 68dab31

Browse files
committed
fix(helm): support global registry override for sidecar
Since grafana#19246 the sidecar image would resolve to registry-mirror.example.com/docker.io/kiwigrid/k8s-sidecar when a global registry mirror was defined. Signed-off-by: Sefa Eyeoglu <[email protected]>
1 parent d1ce5cb commit 68dab31

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

docs/sources/setup/install/helm/reference.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12239,14 +12239,23 @@ false
1223912239
<td><pre lang="json">
1224012240
"IfNotPresent"
1224112241
</pre>
12242+
</td>
12243+
</tr>
12244+
<tr>
12245+
<td>sidecar.image.registry</td>
12246+
<td>string</td>
12247+
<td>The Docker registry for the k8s sidecar</td>
12248+
<td><pre lang="json">
12249+
"docker.io"
12250+
</pre>
1224212251
</td>
1224312252
</tr>
1224412253
<tr>
1224512254
<td>sidecar.image.repository</td>
1224612255
<td>string</td>
12247-
<td>The Docker registry and image for the k8s sidecar</td>
12256+
<td>Docker image repository for the k8s sidecar</td>
1224812257
<td><pre lang="json">
12249-
"docker.io/kiwigrid/k8s-sidecar"
12258+
"kiwigrid/k8s-sidecar"
1225012259
</pre>
1225112260
</td>
1225212261
</tr>

production/helm/loki/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Entries should include a reference to the pull request that introduced the chang
1313

1414
## Unreleased
1515

16+
- [BUGFIX] Support global registry override for sidecar
17+
1618
## 6.45.2
1719

1820
- [BUGFIX] Fix incorrect GEL version in the chart and reference.

production/helm/loki/values.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3984,8 +3984,10 @@ extraObjects: null
39843984

39853985
sidecar:
39863986
image:
3987-
# -- The Docker registry and image for the k8s sidecar
3988-
repository: docker.io/kiwigrid/k8s-sidecar
3987+
# -- The Docker registry for the k8s sidecar
3988+
registry: docker.io
3989+
# -- Docker image repository for the k8s sidecar
3990+
repository: kiwigrid/k8s-sidecar
39893991
# -- Docker image tag
39903992
tag: 1.30.10
39913993
# -- Docker image sha. If empty, no sha will be used

0 commit comments

Comments
 (0)