Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[promtail] Allow parent charts to override registry hostname and credentials #2221

Merged
merged 8 commits into from
Jul 24, 2023

Conversation

johnswarbrick-napier
Copy link
Contributor

Reworked PR #2219 with a rebase and incremented minor version.

Add support for optionally overriding the registry hostname and credentials from a parent chart.

This is important for air-gapped installations which do not have direct access to the public internet and must use a private, internal container registry.

It also avoids having to modify the Promtail Helm chart directly.

FAO: @unguiculus and @Whyeasy

Signed-off-by: John Swarbrick <john.swarbrick@napier.ai>
@johnswarbrick-napier johnswarbrick-napier changed the title Allow parent charts to override registry hostname and credentials [promtail] Allow parent charts to override registry hostname and credentials Feb 20, 2023
Signed-off-by: John Swarbrick <john.swarbrick@napier.ai>
@johnswarbrick-napier
Copy link
Contributor Author

Apologies, I didn't realise the README was generated automatically with helm-docs.

Have now reverted the change to README and hopefully this now passes the linting tests.

FAO: @unguiculus and @Whyeasy

@johnswarbrick-napier
Copy link
Contributor Author

Hi @unguiculus and @Whyeasy

Sorry to chase, would it be possible to review and merge this PR please?

Really keen to get private registry supporting working for promtail

Thanks :)

Signed-off-by: John Swarbrick <john.swarbrick@napier.ai>
@johnswarbrick-napier
Copy link
Contributor Author

Hi @unguiculus and @Whyeasy - please could you review and approve this PR for PromTail?

Adding support for private registries will make it possible to deploy into "air-gapped" environments which do not have direct access to the public internet and must mirror everything into a private, internal container registry.

I have made similar changes to other projects in the Grafana and Prometheus Helm Chart repos. It's just Promtail which is remaining.

Thank you! :)

zanhsieh added 4 commits July 24, 2023 17:21
Signed-off-by: MH <zanhsieh@gmail.com>
Signed-off-by: MH <zanhsieh@gmail.com>
Signed-off-by: MH <zanhsieh@gmail.com>
@zanhsieh zanhsieh merged commit 92ea561 into grafana:main Jul 24, 2023
@johnswarbrick-napier
Copy link
Contributor Author

Deployed and confirmed working - thank you @zanhsieh!

@johnswarbrick-napier johnswarbrick-napier deleted the promtail-private-registry branch July 24, 2023 14:23
@zanhsieh zanhsieh mentioned this pull request Jul 26, 2023
kodiakhq bot referenced this pull request in cloudquery/helm-charts Aug 1, 2023
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [promtail](https://grafana.com/loki) ([source](https://github.com/grafana/helm-charts)) | patch | `6.11.5` -> `6.11.9` |

---

### Release Notes

<details>
<summary>grafana/helm-charts (promtail)</summary>

### [`v6.11.9`](https://github.com/grafana/helm-charts/releases/tag/promtail-6.11.9)

[Compare Source](https://github.com/grafana/helm-charts/compare/promtail-6.11.8...promtail-6.11.9)

Promtail is an agent which ships the contents of local logs to a Loki instance

#### What's Changed

-   \[promtail] Allow parent charts to override registry hostname and credentials by [@&#8203;johnswarbrick-napier](https://github.com/johnswarbrick-napier) in [https://github.com/grafana/helm-charts/pull/2221](https://github.com/grafana/helm-charts/pull/2221)

#### New Contributors

-   [@&#8203;johnswarbrick-napier](https://github.com/johnswarbrick-napier) made their first contribution in [https://github.com/grafana/helm-charts/pull/2221](https://github.com/grafana/helm-charts/pull/2221)

**Full Changelog**: grafana/helm-charts@helm-loki-5.9.0...promtail-6.11.9

### [`v6.11.8`](https://github.com/grafana/helm-charts/releases/tag/promtail-6.11.8)

[Compare Source](https://github.com/grafana/helm-charts/compare/promtail-6.11.7...promtail-6.11.8)

Promtail is an agent which ships the contents of local logs to a Loki instance

#### What's Changed

-   \[promtail] allowing to configure Promtail log format by [@&#8203;hadik3r](https://github.com/hadik3r) in [https://github.com/grafana/helm-charts/pull/2426](https://github.com/grafana/helm-charts/pull/2426)

#### New Contributors

-   [@&#8203;hadik3r](https://github.com/hadik3r) made their first contribution in [https://github.com/grafana/helm-charts/pull/2426](https://github.com/grafana/helm-charts/pull/2426)

**Full Changelog**: grafana/helm-charts@loki-distributed-0.70.0...promtail-6.11.8

### [`v6.11.7`](https://github.com/grafana/helm-charts/releases/tag/promtail-6.11.7)

[Compare Source](https://github.com/grafana/helm-charts/compare/promtail-6.11.6...promtail-6.11.7)

Promtail is an agent which ships the contents of local logs to a Loki instance

#### What's Changed

-   \[promtail] fix instance label by [@&#8203;maciekm](https://github.com/maciekm) in [https://github.com/grafana/helm-charts/pull/2506](https://github.com/grafana/helm-charts/pull/2506)

#### New Contributors

-   [@&#8203;maciekm](https://github.com/maciekm) made their first contribution in [https://github.com/grafana/helm-charts/pull/2506](https://github.com/grafana/helm-charts/pull/2506)

**Full Changelog**: grafana/helm-charts@tempo-distributed-1.4.10...promtail-6.11.7

### [`v6.11.6`](https://github.com/grafana/helm-charts/releases/tag/promtail-6.11.6)

[Compare Source](https://github.com/grafana/helm-charts/compare/promtail-6.11.5...promtail-6.11.6)

Promtail is an agent which ships the contents of local logs to a Loki instance

#### What's Changed

-   \[promtail] HPA scaling behavior support by [@&#8203;anosulchik](https://github.com/anosulchik) in [https://github.com/grafana/helm-charts/pull/2499](https://github.com/grafana/helm-charts/pull/2499)

#### New Contributors

-   [@&#8203;anosulchik](https://github.com/anosulchik) made their first contribution in [https://github.com/grafana/helm-charts/pull/2499](https://github.com/grafana/helm-charts/pull/2499)

**Full Changelog**: grafana/helm-charts@grafana-6.58.3...promtail-6.11.6

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzYuMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants