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

[grafana] Range over extraVolumes #2712

Merged
merged 5 commits into from
Oct 29, 2023
Merged

[grafana] Range over extraVolumes #2712

merged 5 commits into from
Oct 29, 2023

Conversation

efbicief
Copy link
Contributor

Previously, this was ranging over extraVolumeClaims instead of extraVolumes, which meant extraVolumes was never read. This caused volumes mounted as extraVolumes to be mounted as emptyDirs.
This also correctly inserts all data from hostPath volumes, and allows configMaps to be used as an extraVolume.

This should fix prometheus-community/helm-charts#3851

@CLAassistant
Copy link

CLAassistant commented Oct 16, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

@zanhsieh zanhsieh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@efbicief
Thanks for the contribution. Can you sign DCO and CLA, as well as bump the version in Chart.yaml again please?

@zanhsieh zanhsieh changed the title [Grafana] Range over extraVolumes [grafana] Range over extraVolumes Oct 18, 2023
Previously, this was ranging over extraVolumeClaims instead of extraVolumes, which meant extraVolumes was never read.
This also correctly inserts all data from hostPath volumes, and aallows configMaps to be used as an extraVolume.

Signed-off-by: Felix B <[email protected]>
Signed-Off-By: Felix B <[email protected]>
Signed-off-by: Felix B <[email protected]>
@efbicief
Copy link
Contributor Author

Apologies for the delay, hopefully that is okay now.

@efbicief
Copy link
Contributor Author

I see we are now on 6.61.1 - should version be bumped to 6.61.2?

@zanhsieh zanhsieh merged commit 53acf02 into grafana:main Oct 29, 2023
szinn referenced this pull request in szinn/k8s-homelab Oct 30, 2023
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [grafana](https://grafana.net)
([source](https://togithub.com/grafana/helm-charts)) | major | `6.61.1`
-> `7.0.1` |

---

### Release Notes

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

###
[`v7.0.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-7.0.1)

[Compare
Source](https://togithub.com/grafana/helm-charts/compare/grafana-7.0.0...grafana-7.0.1)

The leading tool for querying and visualizing time series and metrics.

#### What's Changed

- \[grafana] fix: include podAnnotation in grafana values for
imagerenderer by
[@&#8203;KelvinVenancio](https://togithub.com/KelvinVenancio) in
[https://github.com/grafana/helm-charts/pull/2738](https://togithub.com/grafana/helm-charts/pull/2738)

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@grafana-7.0.0...grafana-7.0.1

###
[`v7.0.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-7.0.0)

[Compare
Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.61.2...grafana-7.0.0)

The leading tool for querying and visualizing time series and metrics.

#### What's Changed

- Update CODEOWNERS by
[@&#8203;zalegrala](https://togithub.com/zalegrala) in
[https://github.com/grafana/helm-charts/pull/2744](https://togithub.com/grafana/helm-charts/pull/2744)
- \[grafana] Rename global.image.registry to global.imageRegistry by
[@&#8203;pvallone](https://togithub.com/pvallone) in
[https://github.com/grafana/helm-charts/pull/2735](https://togithub.com/grafana/helm-charts/pull/2735)

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@grafana-6.61.2...grafana-7.0.0

###
[`v6.61.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-6.61.2)

[Compare
Source](https://togithub.com/grafana/helm-charts/compare/grafana-6.61.1...grafana-6.61.2)

The leading tool for querying and visualizing time series and metrics.

#### What's Changed

- \[grafana] Range over extraVolumes by
[@&#8203;efbicief](https://togithub.com/efbicief) in
[https://github.com/grafana/helm-charts/pull/2712](https://togithub.com/grafana/helm-charts/pull/2712)

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@loki-distributed-0.76.1...grafana-6.61.2

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
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://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNS4yIiwidXBkYXRlZEluVmVyIjoiMzcuMzUuMiIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: repo-jeeves <106431701+repo-jeeves[bot]@users.noreply.github.com>
diversit added a commit to diversit/helm-charts that referenced this pull request Nov 15, 2023
Fixing issue grafana#2777 by adding back mounting any volumes in the 'extraVolumeMounts' property which was removed by PR grafana#2712 .
diversit added a commit to diversit/helm-charts that referenced this pull request Nov 15, 2023
Fixing issue grafana#2777 by adding back mounting any volumes in the 'extraVolumeMounts' property which was removed by PR grafana#2712 .

Signed-off-by: Joost den Boer <[email protected]>
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.

[grafana] Extra volumemounts are being mounted by an emptyDir instead of the secret/configMap
3 participants