From 698792728faf8cfeabaf7a7c735c91229cc0c07f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 09:39:44 -0600
Subject: [PATCH] chore(deps): update grafana (#144)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[![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.5.0` -> `8.6.0` |
| docker.io/grafana/grafana | minor | `10.3.1` -> `10.4.0` |
|
[ghcr.io/kiwigrid/k8s-sidecar](https://togithub.com/kiwigrid/k8s-sidecar)
| minor | `1.25.3` -> `1.26.1` |
| [grafana](https://grafana.com)
([source](https://togithub.com/grafana/helm-charts)) | patch | `7.3.0`
-> `7.3.6` |
|
[registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar](https://togithub.com/kiwigrid/k8s-sidecar)
([source](https://repo1.dso.mil/dsop/kiwigrid/k8s-sidecar)) | minor |
`1.25.3` -> `1.26.1` |
|
[registry1.dso.mil/ironbank/opensource/grafana/grafana](https://togithub.com/grafana/grafana)
([source](https://repo1.dso.mil/dsop/opensource/grafana/grafana)) |
minor | `10.3.1` -> `10.4.0` |
---
### Release Notes
curl/curl-container (docker.io/curlimages/curl)
###
[`v8.6.0`](https://togithub.com/curl/curl-container/blob/HEAD/CHANGELOG.md#860---2024-01-31)
[Compare
Source](https://togithub.com/curl/curl-container/compare/8.5.0...8.6.0)
##### Changed
- bump to curl 8.6.0
- bump to alpine 3.19.1
kiwigrid/k8s-sidecar (ghcr.io/kiwigrid/k8s-sidecar)
###
[`v1.26.1`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.26.1)
[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.26.0...1.26.1)
##### 💬 Other
- Update README.md
- PR:
[#330](https://togithub.com/kiwigrid/k8s-sidecar/issues/330)
###
[`v1.26.0`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.26.0)
[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.25.6...1.26.0)
##### 🐛 Fixes
- \#minor Remove unnecessary sleep before each watch cycle
- PR:
[#326](https://togithub.com/kiwigrid/k8s-sidecar/issues/326)
###
[`v1.25.6`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.25.6)
[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.25.5...1.25.6)
##### 📦 Dependencies
- build(deps): bump logfmter from 0.0.6 to 0.0.7 in /src
- PR:
[#320](https://togithub.com/kiwigrid/k8s-sidecar/issues/320)
###
[`v1.25.5`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.25.5)
[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.25.4...1.25.5)
##### 📦 Dependencies
- build(deps): bump python from 3.13.0a3-alpine3.18 to
3.13.0a4-alpine3.18
- PR:
[#328](https://togithub.com/kiwigrid/k8s-sidecar/issues/328)
###
[`v1.25.4`](https://togithub.com/kiwigrid/k8s-sidecar/releases/tag/1.25.4)
[Compare
Source](https://togithub.com/kiwigrid/k8s-sidecar/compare/1.25.3...1.25.4)
##### 📦 Dependencies
- build(deps): bump python from 3.12.0-alpine3.18 to 3.12.1-alpine3.18
- PR:
[#316](https://togithub.com/kiwigrid/k8s-sidecar/issues/316)
- build(deps): bump python from 3.12.1-alpine3.18 to 3.13.0a3-alpine3.18
- PR:
[#323](https://togithub.com/kiwigrid/k8s-sidecar/issues/323)
grafana/helm-charts (grafana)
###
[`v7.3.6`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-7.3.6)
[Compare
Source](https://togithub.com/grafana/helm-charts/compare/grafana-7.3.5...grafana-7.3.6)
The leading tool for querying and visualizing time series and metrics.
#### What's Changed
- \[grafana] bump kiwigrid/k8s-sidecar to 1.26.1 by
[@kvanzuijlen](https://togithub.com/kvanzuijlen) in
[https://github.com/grafana/helm-charts/pull/3011](https://togithub.com/grafana/helm-charts/pull/3011)
**Full Changelog**:
https://github.com/grafana/helm-charts/compare/grafana-7.3.5...grafana-7.3.6
###
[`v7.3.5`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-7.3.5)
[Compare
Source](https://togithub.com/grafana/helm-charts/compare/grafana-7.3.4...grafana-7.3.5)
The leading tool for querying and visualizing time series and metrics.
#### What's Changed
- \[grafana] bump kiwigrid/k8s-sidecar version to 1.26.0 by
[@kvanzuijlen](https://togithub.com/kvanzuijlen) in
[https://github.com/grafana/helm-charts/pull/2993](https://togithub.com/grafana/helm-charts/pull/2993)
**Full Changelog**:
https://github.com/grafana/helm-charts/compare/grafana-7.3.4...grafana-7.3.5
###
[`v7.3.4`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-7.3.4)
[Compare
Source](https://togithub.com/grafana/helm-charts/compare/grafana-7.3.3...grafana-7.3.4)
The leading tool for querying and visualizing time series and metrics.
#### What's Changed
- \[grafana] Add `serviceAccount.automountServiceAccountToken` and
document `automountServiceAccountToken` by
[@jkroepke](https://togithub.com/jkroepke) in
[https://github.com/grafana/helm-charts/pull/2997](https://togithub.com/grafana/helm-charts/pull/2997)
**Full Changelog**:
https://github.com/grafana/helm-charts/compare/grafana-agent-0.36.0...grafana-7.3.4
###
[`v7.3.3`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-7.3.3)
[Compare
Source](https://togithub.com/grafana/helm-charts/compare/grafana-7.3.2...grafana-7.3.3)
The leading tool for querying and visualizing time series and metrics.
#### What's Changed
- \[grafana] Add value for pod.spec.automountServiceAccountToken by
[@jkroepke](https://togithub.com/jkroepke) in
[https://github.com/grafana/helm-charts/pull/2991](https://togithub.com/grafana/helm-charts/pull/2991)
**Full Changelog**:
https://github.com/grafana/helm-charts/compare/loki-distributed-0.78.3...grafana-7.3.3
###
[`v7.3.2`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-7.3.2)
[Compare
Source](https://togithub.com/grafana/helm-charts/compare/grafana-7.3.1...grafana-7.3.2)
The leading tool for querying and visualizing time series and metrics.
#### What's Changed
- \[grafana] autoMount set to false in values.yaml by
[@Sheikh-Abubaker](https://togithub.com/Sheikh-Abubaker) in
[https://github.com/grafana/helm-charts/pull/2977](https://togithub.com/grafana/helm-charts/pull/2977)
**Full Changelog**:
https://github.com/grafana/helm-charts/compare/grafana-7.3.1...grafana-7.3.2
###
[`v7.3.1`](https://togithub.com/grafana/helm-charts/releases/tag/grafana-7.3.1)
[Compare
Source](https://togithub.com/grafana/helm-charts/compare/grafana-7.3.0...grafana-7.3.1)
The leading tool for querying and visualizing time series and metrics.
#### What's Changed
- \[grafana] Update Grafana to version 10.3.3 by
[@Footur](https://togithub.com/Footur) in
[https://github.com/grafana/helm-charts/pull/2965](https://togithub.com/grafana/helm-charts/pull/2965)
**Full Changelog**:
https://github.com/grafana/helm-charts/compare/grafana-agent-0.33.0...grafana-7.3.1
---
### 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.
---
- [ ] 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).
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
src/grafana/common/zarf.yaml | 2 +-
src/grafana/values/registry1-values.yaml | 4 ++--
src/grafana/values/upstream-values.yaml | 6 +++---
src/grafana/zarf.yaml | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/grafana/common/zarf.yaml b/src/grafana/common/zarf.yaml
index 21c302cf4..e951774ee 100644
--- a/src/grafana/common/zarf.yaml
+++ b/src/grafana/common/zarf.yaml
@@ -14,7 +14,7 @@ components:
localPath: ../chart
- name: grafana
url: https://grafana.github.io/helm-charts/
- version: 7.3.0
+ version: 7.3.6
namespace: grafana
valuesFiles:
- ../values/values.yaml
diff --git a/src/grafana/values/registry1-values.yaml b/src/grafana/values/registry1-values.yaml
index 4b021f9ac..80f53743d 100644
--- a/src/grafana/values/registry1-values.yaml
+++ b/src/grafana/values/registry1-values.yaml
@@ -1,7 +1,7 @@
image:
registry: registry1.dso.mil
repository: ironbank/opensource/grafana/grafana
- tag: 10.3.1
+ tag: 10.4.0
initChownData:
image:
@@ -18,4 +18,4 @@ sidecar:
image:
registry: registry1.dso.mil
repository: ironbank/kiwigrid/k8s-sidecar
- tag: 1.25.3
+ tag: 1.26.1
diff --git a/src/grafana/values/upstream-values.yaml b/src/grafana/values/upstream-values.yaml
index 6500465e2..9d9392f0f 100644
--- a/src/grafana/values/upstream-values.yaml
+++ b/src/grafana/values/upstream-values.yaml
@@ -3,12 +3,12 @@ sidecar:
# -- The Docker registry
registry: ghcr.io
repository: kiwigrid/k8s-sidecar
- tag: 1.25.3
+ tag: 1.26.1
image:
registry: docker.io
repository: grafana/grafana
- tag: 10.3.1
+ tag: 10.4.0
initChownData:
image:
@@ -19,4 +19,4 @@ initChownData:
downloadDashboardsImage:
registry: docker.io
repository: curlimages/curl
- tag: 8.5.0
+ tag: 8.6.0
diff --git a/src/grafana/zarf.yaml b/src/grafana/zarf.yaml
index 86b481c18..f43dcae06 100644
--- a/src/grafana/zarf.yaml
+++ b/src/grafana/zarf.yaml
@@ -21,10 +21,10 @@ components:
valuesFiles:
- values/upstream-values.yaml
images:
- - docker.io/grafana/grafana:10.3.1
- - docker.io/curlimages/curl:8.5.0
+ - docker.io/grafana/grafana:10.4.0
+ - docker.io/curlimages/curl:8.6.0
- docker.io/library/busybox:1.36.1
- - ghcr.io/kiwigrid/k8s-sidecar:1.25.3
+ - ghcr.io/kiwigrid/k8s-sidecar:1.26.1
- name: grafana
required: true
@@ -37,6 +37,6 @@ components:
valuesFiles:
- values/registry1-values.yaml
images:
- - registry1.dso.mil/ironbank/opensource/grafana/grafana:10.3.1
+ - registry1.dso.mil/ironbank/opensource/grafana/grafana:10.4.0
- registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal:9.3
- - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.25.3
+ - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.26.1