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] Introduce toggle for volumeName lookup #3163

Merged
merged 8 commits into from
Jul 1, 2024

Conversation

jkroepke
Copy link
Collaborator

@jkroepke jkroepke commented Jun 9, 2024

Fixes #3125

#3041 was introduced without a real problem to mention.

However, with the lookup function, helm-diff shows always an diff, since the lookup function does not work together with helm template.

Since the change is merged, it's very to cut out. In conclusion, I add an toggle to turn off that feature. The toggle is enabled by default to avoid any breaking changes. Power users can decided to turn off that feature if they wish.

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
@kstevensonnv
Copy link

@jkroepke I'm trying this out but still seeing the change when running a diff, any ideas?

❯ helm list
NAME    NAMESPACE       REVISION        UPDATED                                 STATUS          CHART           APP VERSION
grafana dashboard       78              2024-06-11 12:41:43.064017 +0100 BST    deployed        grafana-7.3.12  10.4.3
persistence:
  enabled: true
  size: 1Gi
  storageClassName: gp2-sc
  lookupVolumeName: false
❯ git clone git@github.com:jkroepke/grafana-helm-charts.git

❯ git checkout lookup

❯ cd grafana-helm-charts/charts/grafana

❯ helm package .
Successfully packaged chart and saved it to: /Users/./Desktop/grafana-helm-charts/charts/grafana/grafana-8.0.2.tgz

❯ helm push grafana-8.0.2.tgz oci://1.dkr.ecr.eu-west-1.amazonaws.com/
Pushed: 1.dkr.ecr.eu-west-1.amazonaws.com/grafana:8.0.2
Digest: sha256:2859baa3121bd7d35c6e1a826b3542b9924d5fbc6b986151316ad9ca5d7f0d8e

❯ helm secrets diff upgrade grafana --namespace dashboard oci://1.dkr.ecr.eu-west-1.amazonaws.com/grafana --version 8.0.2 -f v
alues.yaml -f secrets.yaml -C 1

dashboard, grafana, PersistentVolumeClaim (v1) has changed:
...
    labels:
-     helm.sh/chart: grafana-7.3.12
+     helm.sh/chart: grafana-8.0.2
      app.kubernetes.io/name: grafana
...
        storage: "1Gi"
-   volumeName: pvc-33eb3487-c224-46d1-b08b-2b3f418320fb
    storageClassName: gp2-sc

❯ grep 'lookupVolumeName' templates/pvc.yaml 
  {{- if and (.Values.persistence.lookupVolumeName) (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)) }}

@jkroepke
Copy link
Collaborator Author

I'm trying this out but still seeing the change when running a diff, any ideas?

The branch needs to be apply once. Thats required to remove volumeName property from the helm state. (Background: by default, helm diff only do a diff against the helm state, not against real resources).

Once applied, the diff should normalized. With that knowledge. #3041 seems pointless. I also never ever saw that some major helm chart have that pattern.

It cloud be possible that Kubernetes may deny the upgrade here, since it's not allowed to modify volumeName property.

@kstevensonnv
Copy link

I have a temporary workaround for now and will try this when it's merged.

Thanks @jkroepke

@drew0ps
Copy link

drew0ps commented Jun 26, 2024

Using ansible we also have problems with the change, therefore merging this PR would be very welcome.
As mentioned above, the change #3041 introduces diffs which breaks reconcile and also makes helm rollback (to revisions which do not have this field in the pvc templates) fail.

@jkroepke
Copy link
Collaborator Author

jkroepke commented Jul 1, 2024

@zanhsieh @zalegrala @Xtigyro Could you please take a look here?

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
@zanhsieh zanhsieh merged commit 550ec3b into grafana:main Jul 1, 2024
6 checks passed
kireque pushed a commit to kireque/home-ops that referenced this pull request Jul 2, 2024
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [grafana](https://grafana.com)
([source](https://togithub.com/grafana/helm-charts)) | patch | `8.2.1`
-> `8.2.2` |

---

### Release Notes

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

###
[`v8.2.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.2.2)

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

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

#### What's Changed

- \[grafana] Introduce toggle for volumeName lookup by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[grafana/helm-charts#3163

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.13.1...grafana-8.2.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:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjEuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQyMS43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZS9oZWxtIiwidHlwZS9wYXRjaCJdfQ==-->

Co-authored-by: kireque-bot[bot] <143391978+kireque-bot[bot]@users.noreply.github.com>
UnicornChance added a commit to defenseunicorns/uds-core that referenced this pull request Jul 3, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker.io/curlimages/curl](https://togithub.com/curl/curl-container)
| minor | `8.7.1` -> `8.8.0` |
| docker.io/grafana/grafana | major | `10.4.2` -> `11.1.0` |
|
[ghcr.io/kiwigrid/k8s-sidecar](https://togithub.com/kiwigrid/k8s-sidecar)
| minor | `1.26.1` -> `1.27.4` |
| [grafana](https://grafana.com)
([source](https://togithub.com/grafana/helm-charts)) | major | `7.3.9`
-> `8.3.1` |
|
[registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar](https://togithub.com/kiwigrid/k8s-sidecar)
([source](https://repo1.dso.mil/dsop/kiwigrid/k8s-sidecar)) | minor |
`1.26.1` -> `1.27.4` |
|
[registry1.dso.mil/ironbank/opensource/grafana/grafana](https://togithub.com/grafana/grafana)
([source](https://repo1.dso.mil/dsop/opensource/grafana/grafana)) |
major | `10.4.2` -> `11.1.0` |
|
[registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal](https://catalog.redhat.com/software/container-stacks/detail/5ec53f50ef29fd35586d9a56)
([source](https://repo1.dso.mil/dsop/redhat/ubi/9.x/ubi9-minimal)) |
minor | `9.3` -> `9.4` |

---

### Release Notes

<details>
<summary>curl/curl-container (docker.io/curlimages/curl)</summary>

###
[`v8.8.0`](https://togithub.com/curl/curl-container/blob/HEAD/CHANGELOG.md#880---2024-05-22)

[Compare
Source](https://togithub.com/curl/curl-container/compare/8.7.1...8.8.0)

##### Changed

-   bump to curl 8.8.0

</details>

<details>
<summary>kiwigrid/k8s-sidecar (ghcr.io/kiwigrid/k8s-sidecar)</summary>

###
[`v1.27.4`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.4)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.27.3...1.27.4)

##### 📦 Dependencies

-   Bump logfmter from 0.0.7 to 0.0.8 in /src
- PR:
[#&#8203;348](https://togithub.com/kiwigrid/k8s-sidecar/issues/348)

###
[`v1.27.3`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.3)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.27.2...1.27.3)

##### 📦 Dependencies

-   Bump requests from 2.32.2 to 2.32.3 in /src
- PR:
[#&#8203;349](https://togithub.com/kiwigrid/k8s-sidecar/issues/349)

###
[`v1.27.2`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.2)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.27.1...1.27.2)

##### 📦 Dependencies

-   build(deps): bump requests from 2.31.0 to 2.32.2 in /src
- PR:
[#&#8203;346](https://togithub.com/kiwigrid/k8s-sidecar/issues/346)

###
[`v1.27.1`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.1)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.27.0...1.27.1)

##### 🚀 Features

-   Add exception_handler
- PR:
[#&#8203;333](https://togithub.com/kiwigrid/k8s-sidecar/issues/333)

###
[`v1.27.0`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.0)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.26.2...1.27.0)

##### 🚀 Features

-   Adding support for req-username-file and req-password-file cli flags
- PR:
[#&#8203;322](https://togithub.com/kiwigrid/k8s-sidecar/issues/322)

##### 🧪 Tests

-   build(deps): bump helm/kind-action from 1.8.0 to 1.10.0
- PR:
[#&#8203;342](https://togithub.com/kiwigrid/k8s-sidecar/issues/342)

###
[`v1.26.2`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.26.2)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.26.1...1.26.2)

##### 📦 Dependencies

-   build(deps): bump kubernetes from 28.1.0 to 29.0.0 in /src
- PR:
[#&#8203;319](https://togithub.com/kiwigrid/k8s-sidecar/issues/319)

</details>

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

###
[`v8.3.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.3.1)

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

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

#### What's Changed

- \[grafana] Add support for envValueFrom in datasources container and
fix typo in dashboards container config by
[@&#8203;rgaduput](https://togithub.com/rgaduput) in
[grafana/helm-charts#3187

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@grafana-8.3.0...grafana-8.3.1

###
[`v8.3.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.3.0)

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

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

#### What's Changed

- \[grafana] Add support for extra volumes for Grafana Image Renderer by
[@&#8203;bradleypettit](https://togithub.com/bradleypettit) in
[grafana/helm-charts#3178

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.13.2...grafana-8.3.0

###
[`v8.2.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.2.2)

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

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

#### What's Changed

- \[grafana] Introduce toggle for volumeName lookup by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[grafana/helm-charts#3163

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.13.1...grafana-8.2.2

###
[`v8.2.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.2.1)

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

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

#### What's Changed

- \[grafana] Update Grafana to 11.1.0 by
[@&#8203;sboulkour](https://togithub.com/sboulkour) in
[grafana/helm-charts#3191

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@grafana-8.2.0...grafana-8.2.1

###
[`v8.2.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.2.0)

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

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

#### What's Changed

- \[grafana] add support for dual stack clusters by
[@&#8203;M0NsTeRRR](https://togithub.com/M0NsTeRRR) in
[grafana/helm-charts#3066

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@grafana-8.1.1...grafana-8.2.0

###
[`v8.1.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.1.1)

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

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

#### What's Changed

- \[grafana] Adding jkroepke as maintainer by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[grafana/helm-charts#3179

**Full Changelog**:
grafana/helm-charts@grafana-8.1.0...grafana-8.1.1

###
[`v8.1.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.1.0)

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

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

#### What's Changed

- \[grafana] feat:Allow hiding persistence warning by
[@&#8203;nikolaik](https://togithub.com/nikolaik) in
[grafana/helm-charts#3013

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@alloy-0.4.0...grafana-8.1.0

###
[`v8.0.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.0.2)

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

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

#### What's Changed

- \[grafana] Adding configmap annotation by
[@&#8203;jmiszczak83](https://togithub.com/jmiszczak83) in
[grafana/helm-charts#3064

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@k8s-monitoring-1.0.13...grafana-8.0.2

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

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

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

#### What's Changed

- \[grafana] conf(grafana): Add `folderUid` option by
[@&#8203;Rohlik](https://togithub.com/Rohlik) in
[grafana/helm-charts#2956

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.11.0...grafana-8.0.1

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

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

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

#### What's Changed

- \[grafana] Update Grafana to 11.0.0 by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[grafana/helm-charts#3139

**Full Changelog**:
grafana/helm-charts@grafana-7.3.12...grafana-8.0.0

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

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

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

#### What's Changed

- \[grafana] Update app version to v10.4.3 by
[@&#8203;xvilo](https://togithub.com/xvilo) in
[grafana/helm-charts#3136

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@oncall-1.5.5...grafana-7.3.12

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

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

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

#### What's Changed

- \[grafana] add the option to set resources for the test framework
container by [@&#8203;dbluxo](https://togithub.com/dbluxo) in
[grafana/helm-charts#2979

**Full Changelog**:
grafana/helm-charts@k8s-monitoring-1.0.8...grafana-7.3.11

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

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

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

#### What's Changed

- \[grafana] Fix HPA selector by
[@&#8203;gritzkoo](https://togithub.com/gritzkoo) in
[grafana/helm-charts#3050

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.9.9...grafana-7.3.10

</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.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

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

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/defenseunicorns/uds-core).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMzEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjQyMS45IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Chance <139784371+UnicornChance@users.noreply.github.com>
lumiere-bot bot added a commit to coolguy1771/home-ops that referenced this pull request Jul 6, 2024
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [grafana](https://grafana.com)
([source](https://togithub.com/grafana/helm-charts)) | minor | `8.2.1`
-> `8.3.2` |

---

### Release Notes

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

###
[`v8.3.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.3.2)

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

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

#### What's Changed

- \[grafana] Clarify documentation for serviceMonitor.enabled by
[@&#8203;oliviermichaelis](https://togithub.com/oliviermichaelis) in
[grafana/helm-charts#3209

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@helm-loki-6.6.5...grafana-8.3.2

###
[`v8.3.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.3.1)

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

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

#### What's Changed

- \[grafana] Add support for envValueFrom in datasources container and
fix typo in dashboards container config by
[@&#8203;rgaduput](https://togithub.com/rgaduput) in
[grafana/helm-charts#3187

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@grafana-8.3.0...grafana-8.3.1

###
[`v8.3.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.3.0)

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

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

#### What's Changed

- \[grafana] Add support for extra volumes for Grafana Image Renderer by
[@&#8203;bradleypettit](https://togithub.com/bradleypettit) in
[grafana/helm-charts#3178

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.13.2...grafana-8.3.0

###
[`v8.2.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.2.2)

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

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

#### What's Changed

- \[grafana] Introduce toggle for volumeName lookup by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[grafana/helm-charts#3163

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.13.1...grafana-8.2.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:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjEuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQyMy4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZS9oZWxtIiwidHlwZS9taW5vciJdfQ==-->

Co-authored-by: lumiere-bot[bot] <98047013+lumiere-bot[bot]@users.noreply.github.com>
rjferguson21 pushed a commit to defenseunicorns/uds-core that referenced this pull request Jul 11, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker.io/curlimages/curl](https://togithub.com/curl/curl-container)
| minor | `8.7.1` -> `8.8.0` |
| docker.io/grafana/grafana | major | `10.4.2` -> `11.1.0` |
|
[ghcr.io/kiwigrid/k8s-sidecar](https://togithub.com/kiwigrid/k8s-sidecar)
| minor | `1.26.1` -> `1.27.4` |
| [grafana](https://grafana.com)
([source](https://togithub.com/grafana/helm-charts)) | major | `7.3.9`
-> `8.3.1` |
|
[registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar](https://togithub.com/kiwigrid/k8s-sidecar)
([source](https://repo1.dso.mil/dsop/kiwigrid/k8s-sidecar)) | minor |
`1.26.1` -> `1.27.4` |
|
[registry1.dso.mil/ironbank/opensource/grafana/grafana](https://togithub.com/grafana/grafana)
([source](https://repo1.dso.mil/dsop/opensource/grafana/grafana)) |
major | `10.4.2` -> `11.1.0` |
|
[registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal](https://catalog.redhat.com/software/container-stacks/detail/5ec53f50ef29fd35586d9a56)
([source](https://repo1.dso.mil/dsop/redhat/ubi/9.x/ubi9-minimal)) |
minor | `9.3` -> `9.4` |

---

### Release Notes

<details>
<summary>curl/curl-container (docker.io/curlimages/curl)</summary>

###
[`v8.8.0`](https://togithub.com/curl/curl-container/blob/HEAD/CHANGELOG.md#880---2024-05-22)

[Compare
Source](https://togithub.com/curl/curl-container/compare/8.7.1...8.8.0)

##### Changed

-   bump to curl 8.8.0

</details>

<details>
<summary>kiwigrid/k8s-sidecar (ghcr.io/kiwigrid/k8s-sidecar)</summary>

###
[`v1.27.4`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.4)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.27.3...1.27.4)

##### 📦 Dependencies

-   Bump logfmter from 0.0.7 to 0.0.8 in /src
- PR:
[#&#8203;348](https://togithub.com/kiwigrid/k8s-sidecar/issues/348)

###
[`v1.27.3`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.3)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.27.2...1.27.3)

##### 📦 Dependencies

-   Bump requests from 2.32.2 to 2.32.3 in /src
- PR:
[#&#8203;349](https://togithub.com/kiwigrid/k8s-sidecar/issues/349)

###
[`v1.27.2`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.2)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.27.1...1.27.2)

##### 📦 Dependencies

-   build(deps): bump requests from 2.31.0 to 2.32.2 in /src
- PR:
[#&#8203;346](https://togithub.com/kiwigrid/k8s-sidecar/issues/346)

###
[`v1.27.1`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.1)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.27.0...1.27.1)

##### 🚀 Features

-   Add exception_handler
- PR:
[#&#8203;333](https://togithub.com/kiwigrid/k8s-sidecar/issues/333)

###
[`v1.27.0`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.27.0)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.26.2...1.27.0)

##### 🚀 Features

-   Adding support for req-username-file and req-password-file cli flags
- PR:
[#&#8203;322](https://togithub.com/kiwigrid/k8s-sidecar/issues/322)

##### 🧪 Tests

-   build(deps): bump helm/kind-action from 1.8.0 to 1.10.0
- PR:
[#&#8203;342](https://togithub.com/kiwigrid/k8s-sidecar/issues/342)

###
[`v1.26.2`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.26.2)

[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.26.1...1.26.2)

##### 📦 Dependencies

-   build(deps): bump kubernetes from 28.1.0 to 29.0.0 in /src
- PR:
[#&#8203;319](https://togithub.com/kiwigrid/k8s-sidecar/issues/319)

</details>

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

###
[`v8.3.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.3.1)

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

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

#### What's Changed

- \[grafana] Add support for envValueFrom in datasources container and
fix typo in dashboards container config by
[@&#8203;rgaduput](https://togithub.com/rgaduput) in
[grafana/helm-charts#3187

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@grafana-8.3.0...grafana-8.3.1

###
[`v8.3.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.3.0)

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

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

#### What's Changed

- \[grafana] Add support for extra volumes for Grafana Image Renderer by
[@&#8203;bradleypettit](https://togithub.com/bradleypettit) in
[grafana/helm-charts#3178

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.13.2...grafana-8.3.0

###
[`v8.2.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.2.2)

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

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

#### What's Changed

- \[grafana] Introduce toggle for volumeName lookup by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[grafana/helm-charts#3163

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.13.1...grafana-8.2.2

###
[`v8.2.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.2.1)

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

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

#### What's Changed

- \[grafana] Update Grafana to 11.1.0 by
[@&#8203;sboulkour](https://togithub.com/sboulkour) in
[grafana/helm-charts#3191

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@grafana-8.2.0...grafana-8.2.1

###
[`v8.2.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.2.0)

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

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

#### What's Changed

- \[grafana] add support for dual stack clusters by
[@&#8203;M0NsTeRRR](https://togithub.com/M0NsTeRRR) in
[grafana/helm-charts#3066

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@grafana-8.1.1...grafana-8.2.0

###
[`v8.1.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.1.1)

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

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

#### What's Changed

- \[grafana] Adding jkroepke as maintainer by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[grafana/helm-charts#3179

**Full Changelog**:
grafana/helm-charts@grafana-8.1.0...grafana-8.1.1

###
[`v8.1.0`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.1.0)

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

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

#### What's Changed

- \[grafana] feat:Allow hiding persistence warning by
[@&#8203;nikolaik](https://togithub.com/nikolaik) in
[grafana/helm-charts#3013

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@alloy-0.4.0...grafana-8.1.0

###
[`v8.0.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-8.0.2)

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

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

#### What's Changed

- \[grafana] Adding configmap annotation by
[@&#8203;jmiszczak83](https://togithub.com/jmiszczak83) in
[grafana/helm-charts#3064

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@k8s-monitoring-1.0.13...grafana-8.0.2

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

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

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

#### What's Changed

- \[grafana] conf(grafana): Add `folderUid` option by
[@&#8203;Rohlik](https://togithub.com/Rohlik) in
[grafana/helm-charts#2956

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.11.0...grafana-8.0.1

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

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

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

#### What's Changed

- \[grafana] Update Grafana to 11.0.0 by
[@&#8203;jkroepke](https://togithub.com/jkroepke) in
[grafana/helm-charts#3139

**Full Changelog**:
grafana/helm-charts@grafana-7.3.12...grafana-8.0.0

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

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

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

#### What's Changed

- \[grafana] Update app version to v10.4.3 by
[@&#8203;xvilo](https://togithub.com/xvilo) in
[grafana/helm-charts#3136

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@oncall-1.5.5...grafana-7.3.12

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

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

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

#### What's Changed

- \[grafana] add the option to set resources for the test framework
container by [@&#8203;dbluxo](https://togithub.com/dbluxo) in
[grafana/helm-charts#2979

**Full Changelog**:
grafana/helm-charts@k8s-monitoring-1.0.8...grafana-7.3.11

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

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

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

#### What's Changed

- \[grafana] Fix HPA selector by
[@&#8203;gritzkoo](https://togithub.com/gritzkoo) in
[grafana/helm-charts#3050

#### New Contributors

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

**Full Changelog**:
grafana/helm-charts@tempo-distributed-1.9.9...grafana-7.3.10

</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.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

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

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/defenseunicorns/uds-core).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMzEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjQyMS45IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Chance <139784371+UnicornChance@users.noreply.github.com>
@ataut-pai
Copy link

I'm trying this out but still seeing the change when running a diff, any ideas?

The branch needs to be apply once. Thats required to remove volumeName property from the helm state. (Background: by default, helm diff only do a diff against the helm state, not against real resources).

Once applied, the diff should normalized. With that knowledge. #3041 seems pointless. I also never ever saw that some major helm chart have that pattern.

It cloud be possible that Kubernetes may deny the upgrade here, since it's not allowed to modify volumeName property.

@jkroepke about "The branch needs to be apply once. Thats required to remove volumeName property from the helm state." how this can be achieved?

unfortunately getting below and can't find a way of passing over it. I've seen recommendations to downgrade Grafana to 7.3.8, but we are using this Grafana chart as a dependency of kube-prometheus-stack which refers to grafana versions as 7.3.* as you can see here.

 Error: cannot patch "prometheus-operator-grafana" with kind PersistentVolumeClaim: PersistentVolumeClaim "prometheus-operator-grafana" is invalid: spec: Forbidden: spec is immutable after creation except resources.requests and volumeAttributesClassName for bound claims
   core.PersistentVolumeClaimSpec{
   	AccessModes:      {"ReadWriteOnce"},
   	Selector:         nil,
   	Resources:        {Requests: {s"storage": {i: {...}, s: "10Gi", Format: "BinarySI"}}},
 - 	VolumeName:       "pvc-fcc8be5f-5d15-4fcf-ba5f-23746cf0c28e",
 + 	VolumeName:       "",
   	StorageClassName: &"kops-ssd-1-17",
   	VolumeMode:       &"Filesystem",
   	... // 3 identical fields
   }

Any thoughts?

@richardwhiuk
Copy link

Given we don't know what this was fixing, and it causes a bunch of issues, I'd be inclined to have this disabled by default, but thanks for the fix.

@jkroepke
Copy link
Collaborator Author

It is disabled by default. This PR add an toggle which does not change the behaivor by default.

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.

3041 breaks Helm Rollback
7 participants