diff --git a/operations/helm/charts/grafana-agent/CHANGELOG.md b/operations/helm/charts/grafana-agent/CHANGELOG.md index 6603ab6fb063..1d739c786eff 100644 --- a/operations/helm/charts/grafana-agent/CHANGELOG.md +++ b/operations/helm/charts/grafana-agent/CHANGELOG.md @@ -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) ------------------- diff --git a/operations/helm/charts/grafana-agent/README.md b/operations/helm/charts/grafana-agent/README.md index c9c5d6df16a9..2423a23cbc66 100644 --- a/operations/helm/charts/grafana-agent/README.md +++ b/operations/helm/charts/grafana-agent/README.md @@ -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. | diff --git a/operations/helm/charts/grafana-agent/values.yaml b/operations/helm/charts/grafana-agent/values.yaml index 254a28e69b2d..0143cefe1962 100644 --- a/operations/helm/charts/grafana-agent/values.yaml +++ b/operations/helm/charts/grafana-agent/values.yaml @@ -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. diff --git a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml index 7ac89ceb865a..4a6e72f132cf 100644 --- a/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/additional-serviceaccount-label/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml index 92ad19130040..af3b0c1fd7e4 100644 --- a/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/clustering/grafana-agent/templates/controllers/statefulset.yaml @@ -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 diff --git a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml index 39aa9491fa20..ef17189995f4 100644 --- a/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/controller-volumes-extra/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml index 74c228870934..b43c8b537889 100644 --- a/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset-hostnetwork/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml index 7ac89ceb865a..4a6e72f132cf 100644 --- a/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/create-daemonset/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml index 478a47d32f56..74959bc95b9e 100644 --- a/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment-autoscaling/grafana-agent/templates/controllers/deployment.yaml @@ -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 diff --git a/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml b/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml index 8fbd88183c0f..e6b30b603cd8 100644 --- a/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml +++ b/operations/helm/tests/create-deployment/grafana-agent/templates/controllers/deployment.yaml @@ -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 diff --git a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml index 06151482680e..9ad9d83989c9 100644 --- a/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset-autoscaling/grafana-agent/templates/controllers/statefulset.yaml @@ -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 diff --git a/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml b/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml index cfaf3fa7aa65..14069e356960 100644 --- a/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml +++ b/operations/helm/tests/create-statefulset/grafana-agent/templates/controllers/statefulset.yaml @@ -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 diff --git a/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml index 7ac89ceb865a..4a6e72f132cf 100644 --- a/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/custom-config/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml index 7ac89ceb865a..4a6e72f132cf 100644 --- a/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/default-values/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml index 7ac89ceb865a..4a6e72f132cf 100644 --- a/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/enable-servicemonitor/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml index 2d5c5f77964a..47e8370cba61 100644 --- a/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/envFrom/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml index 683d4c72adce..204bc2f541ff 100644 --- a/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/existing-config/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml index ff83778a94a9..a68d13450e34 100644 --- a/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-env/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml index 4566af378b4c..4b2b1c4bad5c 100644 --- a/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/extra-ports/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml index cb4f0c8964f6..c4d490e0fc70 100644 --- a/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/faro-ingress/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml index e229da2bf950..1a6efea09785 100644 --- a/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml index 09768a686b48..692304acd2f1 100644 --- a/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/global-image-registry/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml index 512c32eece2e..ccf576637bed 100644 --- a/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/initcontainers/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml index c3a0fb4cafe1..9aa16540da65 100644 --- a/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-pullsecrets/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml index 09768a686b48..692304acd2f1 100644 --- a/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/local-image-registry/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml index 6de1e5ad8593..8cb19e413aa5 100644 --- a/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/nodeselectors-and-tolerations/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml index 0b22a92e6773..f2d72440edf6 100644 --- a/operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/sidecars/grafana-agent/templates/controllers/daemonset.yaml @@ -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 diff --git a/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml b/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml index aedb6a176381..34b4d0a38504 100644 --- a/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml +++ b/operations/helm/tests/static-mode/grafana-agent/templates/controllers/daemonset.yaml @@ -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