Skip to content

Commit 9e9ebea

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 <contact@scrumplex.net>
1 parent 265601f commit 9e9ebea

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12269,14 +12269,23 @@ false
1226912269
<td><pre lang="json">
1227012270
"IfNotPresent"
1227112271
</pre>
12272+
</td>
12273+
</tr>
12274+
<tr>
12275+
<td>sidecar.image.registry</td>
12276+
<td>string</td>
12277+
<td>The Docker registry for the k8s sidecar</td>
12278+
<td><pre lang="json">
12279+
"docker.io"
12280+
</pre>
1227212281
</td>
1227312282
</tr>
1227412283
<tr>
1227512284
<td>sidecar.image.repository</td>
1227612285
<td>string</td>
12277-
<td>The Docker registry and image for the k8s sidecar</td>
12286+
<td>Docker image repository for the k8s sidecar</td>
1227812287
<td><pre lang="json">
12279-
"docker.io/kiwigrid/k8s-sidecar"
12288+
"kiwigrid/k8s-sidecar"
1228012289
</pre>
1228112290
</td>
1228212291
</tr>

production/helm/loki/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Entries should include a reference to the pull request that introduced the chang
1818
- [BUGFIX] Wrong context passed to loki.namespace helper from table manager servicemonitor. [#19461](https://github.com/grafana/loki/pull/19461)
1919
- [BUGFIX] Don't fail for missing bucket name, if local disk is used. [#19675](https://github.com/grafana/loki/pull/19675)
2020
- [FEATURE] Add load balancer port to query-frontend service. [#19462](https://github.com/grafana/loki/pull/19462)
21+
- [BUGFIX] Support global registry override for sidecar. [#19671](https://github.com/grafana/loki/pull/19671)
2122

2223
## 6.45.2
2324

production/helm/loki/values.yaml

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

39983998
sidecar:
39993999
image:
4000-
# -- The Docker registry and image for the k8s sidecar
4001-
repository: docker.io/kiwigrid/k8s-sidecar
4000+
# -- The Docker registry for the k8s sidecar
4001+
registry: docker.io
4002+
# -- Docker image repository for the k8s sidecar
4003+
repository: kiwigrid/k8s-sidecar
40024004
# -- Docker image tag
40034005
tag: 1.30.10
40044006
# -- Docker image sha. If empty, no sha will be used

0 commit comments

Comments
 (0)