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.

Sign up for GitHub

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

chore(deps): bump github.com/jimmidyson/configmap-reload from v0.8.0 to v0.12.0 and point to ghcr.io registry #5920

Merged
merged 8 commits into from
Jan 8, 2024
Merged

chore(deps): bump github.com/jimmidyson/configmap-reload from v0.8.0 to v0.12.0 and point to ghcr.io registry #5920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f931495
chore(deps): bump github.com/jimmidyson/configmap-reload from v0.8.0 …
berendiwema Dec 6, 2023
019131a
Merge branch 'main' into chore/update-configmap-reloader-deps
berendiwema Dec 7, 2023
782acdc
Merge branch 'main' into chore/update-configmap-reloader-deps
berendiwema Dec 13, 2023
0fb5e5f
Merge branch 'main' into chore/update-configmap-reloader-deps
berendiwema Dec 15, 2023
879175a
Merge branch 'main' into chore/update-configmap-reloader-deps
berendiwema Dec 19, 2023
c5e0bb8
Merge branch 'main' into chore/update-configmap-reloader-deps
rfratto Jan 8, 2024
7ed14b6
misc: move changelog entry
rfratto Jan 8, 2024
b7d903b
Merge branch 'main' into chore/update-configmap-reloader-deps
rfratto Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions operations/helm/charts/grafana-agent/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ Unreleased

- Statefulset should use value `.controller.enableStatefulSetAutoDeletePVC` instead of just `.enableStatefulSetAutoDeletePVC`. (@captncraig)

### Other changes

- Change config reloader image to `ghcr.io/jimmidyson/configmap-reload:v0.12.0` to reflect change in repository and version. (@berendiwema)


0.29.0 (2023-11-30)
-------------------

Expand Down
4 changes: 2 additions & 2 deletions operations/helm/charts/grafana-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ use the older mode (called "static mode"), set the `agent.mode` value to
| configReloader.customArgs | list | `[]` | Override the args passed to the container. |
| configReloader.enabled | bool | `true` | Enables automatically reloading when the agent config changes. |
| configReloader.image.digest | string | `""` | SHA256 digest of image to use for config reloading (either in format "sha256:XYZ" or "XYZ"). When set, will override `configReloader.image.tag` |
| configReloader.image.registry | string | `"docker.io"` | Config reloader image registry (defaults to docker.io) |
| configReloader.image.registry | string | `"ghcr.io"` | Config reloader image registry (defaults to docker.io) |
| configReloader.image.repository | string | `"jimmidyson/configmap-reload"` | Repository to get config reloader image from. |
| configReloader.image.tag | string | `"v0.8.0"` | Tag of image to use for config reloading. |
| configReloader.image.tag | string | `"v0.12.0"` | Tag of image to use for config reloading. |
| configReloader.resources | object | `{"requests":{"cpu":"1m","memory":"5Mi"}}` | Resource requests and limits to apply to the config reloader container. |
| configReloader.securityContext | object | `{}` | Security context to apply to the Grafana configReloader container. |
| controller.affinity | object | `{}` | Affinity configuration for pods. |
Expand Down
4 changes: 2 additions & 2 deletions operations/helm/charts/grafana-agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ configReloader:
enabled: true
image:
# -- Config reloader image registry (defaults to docker.io)
registry: "docker.io"
registry: "ghcr.io"
# -- Repository to get config reloader image from.
repository: jimmidyson/configmap-reload
# -- Tag of image to use for config reloading.
tag: v0.8.0
tag: v0.12.0
# -- SHA256 digest of image to use for config reloading (either in format "sha256:XYZ" or "XYZ"). When set, will override `configReloader.image.tag`
digest: ""
# -- Override the args passed to the container.
Expand Down
2 changes: 1 addition & 1 deletion .../tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...ns/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
mountPath: /cache
name: cache-volume
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...elm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...m/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...ations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...tions/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...ns/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...tions/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: quay.io/jimmidyson/configmap-reload:v0.8.0
image: quay.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
mountPath: /etc/geoip
name: geoip
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...ons/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...ations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: quay.io/jimmidyson/configmap-reload:v0.8.0
image: quay.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion ...lm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
mountPath: /etc/geoip
name: geoip
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down
2 changes: 1 addition & 1 deletion operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
- name: config
mountPath: /etc/agent
- name: config-reloader
image: docker.io/jimmidyson/configmap-reload:v0.8.0
image: ghcr.io/jimmidyson/configmap-reload:v0.12.0
args:
- --volume-dir=/etc/agent
- --webhook-url=http://localhost:80/-/reload
Expand Down