fix: Fixed errors caused by the removal of free Chainguard images (#1082

) Signed-off-by: Steve Hipwell <[email protected]>
stevehipwell · Nov 22, 2024 · 6ba559f · 6ba559f
1 parent 7de51d5
commit 6ba559f
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 47 deletions.
diff --git a/charts/fluent-bit-aggregator/CHANGELOG.md b/charts/fluent-bit-aggregator/CHANGELOG.md
@@ -14,6 +14,12 @@
 
 ## [UNRELEASED]
 
+## [v0.16.1] - 2024-11-22
+
+### Changed
+
+- Updated hot-reload image to use `ghcr.io/jimmidyson/configmap-reload` as the _Chainguard_ image is no longer available. ([#1082](https://github.com/stevehipwell/helm-charts/pull/1082)) _@stevehipwell_
+
 ## [v0.16.0] - 2024-11-20
 
 ### Changed
@@ -308,6 +314,7 @@
 RELEASE LINKS
 -->
 [UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/fluent-bit-aggregator
+[v0.16.1]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-aggregator-0.16.1
 [v0.16.0]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-aggregator-0.16.0
 [v0.15.10]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-aggregator-0.15.10
 [v0.15.9]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-aggregator-0.15.9

diff --git a/charts/fluent-bit-aggregator/Chart.yaml b/charts/fluent-bit-aggregator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: fluent-bit-aggregator
 description: Helm chart for Fluent Bit running as an aggregation stateful set.
 type: application
-version: 0.16.0
+version: 0.16.1
 appVersion: 3.2.1
 keywords:
   - fluent
@@ -23,4 +23,4 @@ annotations:
   artifacthub.io/alternativeName: fluent-bit
   artifacthub.io/changes: |
     - kind: changed
-      description: "Updated _Fluent Bit_ OCI image to [v3.2.1](https://github.com/fluent/fluent-bit/releases/tag/v3.2.1)."
+      description: "Updated hot-reload image to use `ghcr.io/jimmidyson/configmap-reload` as the _Chainguard_ image is no longer available."
diff --git a/charts/fluent-bit-aggregator/README.md b/charts/fluent-bit-aggregator/README.md
@@ -1,6 +1,6 @@
 # fluent-bit-aggregator
 
-![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.1](https://img.shields.io/badge/AppVersion-3.2.1-informational?style=flat-square)
+![Version: 0.16.1](https://img.shields.io/badge/Version-0.16.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.1](https://img.shields.io/badge/AppVersion-3.2.1-informational?style=flat-square)
 
 Helm chart for Fluent Bit running as an aggregation stateful set.
 
@@ -24,15 +24,15 @@ Helm chart for Fluent Bit running as an aggregation stateful set.
 To install the chart using the recommended OCI method you can use the following command.
 
 ```shell
-helm upgrade --install fluent-bit-aggregator oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-aggregator --version 0.16.0
+helm upgrade --install fluent-bit-aggregator oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-aggregator --version 0.16.1
 ```
 
 #### Verification
 
 As the OCI chart release is signed by [Cosign](https://github.com/sigstore/cosign) you can verify the chart before installing it by running the following command.
 
 ```shell
-cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/fluent-bit-aggregator:0.16.0
+cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/fluent-bit-aggregator:0.16.1
 ```
 
 ### Non-OCI Repository
@@ -41,7 +41,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
 
 ```shell
 helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
-helm upgrade --install fluent-bit-aggregator stevehipwell/fluent-bit-aggregator --version 0.16.0
+helm upgrade --install fluent-bit-aggregator stevehipwell/fluent-bit-aggregator --version 0.16.1
 ```
 
 ## Values
@@ -72,8 +72,8 @@ helm upgrade --install fluent-bit-aggregator stevehipwell/fluent-bit-aggregator
 | hotReload.enabled | bool | `false` | If `true`, enable [hot-reload](https://docs.fluentbit.io/manual/administration/hot-reload) via a sidecar container. |
 | hotReload.image.digest | string | `nil` | Optional image digest for the hot-reload sidecar container. |
 | hotReload.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the hot-reload sidecar container. |
-| hotReload.image.repository | string | `"cgr.dev/chainguard/configmap-reload"` | Image repository for the hot-reload sidecar container. |
-| hotReload.image.tag | string | `"latest"` | Image tag for the hot-reload sidecar container. |
+| hotReload.image.repository | string | `"ghcr.io/jimmidyson/configmap-reload"` | Image repository for the hot-reload sidecar container. |
+| hotReload.image.tag | string | `"v0.14.0"` | Image tag for the hot-reload sidecar container. |
 | hotReload.resources | object | `{}` | Resources for the hot-reload sidecar container. |
 | image.digest | string | `nil` | Optional image digest for the default container. |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the default container. |

diff --git a/charts/fluent-bit-aggregator/values.yaml b/charts/fluent-bit-aggregator/values.yaml
@@ -317,9 +317,9 @@ hotReload:
   enabled: false
   image:
     # -- Image repository for the hot-reload sidecar container.
-    repository: cgr.dev/chainguard/configmap-reload
+    repository: ghcr.io/jimmidyson/configmap-reload
     # -- Image tag for the hot-reload sidecar container.
-    tag: latest
+    tag: v0.14.0
     # -- (string) Optional image digest for the hot-reload sidecar container.
     digest:
     # --  Image pull policy for the hot-reload sidecar container.

diff --git a/charts/fluent-bit-collector/CHANGELOG.md b/charts/fluent-bit-collector/CHANGELOG.md
@@ -14,6 +14,12 @@
 
 ## [UNRELEASED]
 
+## [v0.13.1] - 2024-11-22
+
+### Changed
+
+- Updated hot-reload image to use `ghcr.io/jimmidyson/configmap-reload` as the _Chainguard_ image is no longer available. ([#1082](https://github.com/stevehipwell/helm-charts/pull/1082)) _@stevehipwell_
+
 ## [v0.13.0] - 2024-11-20
 
 ### Changed
@@ -245,6 +251,7 @@
 RELEASE LINKS
 -->
 [UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/fluent-bit-collector
+[v0.13.1]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-collector-0.13.1
 [v0.13.0]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-collector-0.13.0
 [v0.12.10]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-collector-0.12.10
 [v0.12.9]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-collector-0.12.9

diff --git a/charts/fluent-bit-collector/Chart.yaml b/charts/fluent-bit-collector/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: fluent-bit-collector
 description: Helm chart for Fluent Bit running as a collector DaemonSet.
 type: application
-version: 0.13.0
+version: 0.13.1
 appVersion: 3.2.1
 keywords:
   - fluent
@@ -23,4 +23,4 @@ annotations:
   artifacthub.io/alternativeName: fluent-bit
   artifacthub.io/changes: |
     - kind: changed
-      description: "Updated _Fluent Bit_ OCI image to [v3.2.1](https://github.com/fluent/fluent-bit/releases/tag/v3.2.1)."
+      description: "Updated hot-reload image to use `ghcr.io/jimmidyson/configmap-reload` as the _Chainguard_ image is no longer available."
diff --git a/charts/fluent-bit-collector/README.md b/charts/fluent-bit-collector/README.md
@@ -1,6 +1,6 @@
 # fluent-bit-collector
 
-![Version: 0.13.0](https://img.shields.io/badge/Version-0.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.1](https://img.shields.io/badge/AppVersion-3.2.1-informational?style=flat-square)
+![Version: 0.13.1](https://img.shields.io/badge/Version-0.13.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.1](https://img.shields.io/badge/AppVersion-3.2.1-informational?style=flat-square)
 
 Helm chart for Fluent Bit running as a collector DaemonSet.
 
@@ -24,15 +24,15 @@ Helm chart for Fluent Bit running as a collector DaemonSet.
 To install the chart using the recommended OCI method you can use the following command.
 
 ```shell
-helm upgrade --install fluent-bit-collector oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-collector --version 0.13.0
+helm upgrade --install fluent-bit-collector oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-collector --version 0.13.1
 ```
 
 #### Verification
 
 As the OCI chart release is signed by [Cosign](https://github.com/sigstore/cosign) you can verify the chart before installing it by running the following command.
 
 ```shell
-cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/fluent-bit-collector:0.13.0
+cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/fluent-bit-collector:0.13.1
 ```
 
 ### Non-OCI Repository
@@ -41,7 +41,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
 
 ```shell
 helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
-helm upgrade --install fluent-bit-collector stevehipwell/fluent-bit-collector --version 0.13.0
+helm upgrade --install fluent-bit-collector stevehipwell/fluent-bit-collector --version 0.13.1
 ```
 
 ## Values
@@ -70,8 +70,8 @@ helm upgrade --install fluent-bit-collector stevehipwell/fluent-bit-collector --
 | hotReload.enabled | bool | `false` | If `true`, enable [hot-reload](https://docs.fluentbit.io/manual/administration/hot-reload) via a sidecar container. |
 | hotReload.image.digest | string | `nil` | Optional image digest for the hot-reload sidecar container. |
 | hotReload.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the hot-reload sidecar container. |
-| hotReload.image.repository | string | `"cgr.dev/chainguard/configmap-reload"` | Image repository for the hot-reload sidecar container. |
-| hotReload.image.tag | string | `"latest"` | Image tag for the hot-reload sidecar container. |
+| hotReload.image.repository | string | `"ghcr.io/jimmidyson/configmap-reload"` | Image repository for the hot-reload sidecar container. |
+| hotReload.image.tag | string | `"v0.14.0"` | Image tag for the hot-reload sidecar container. |
 | hotReload.resources | object | `{}` | Resources for the hot-reload sidecar container. |
 | image.digest | string | `nil` | Optional image digest for the default container. |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the default container. |

diff --git a/charts/fluent-bit-collector/values.yaml b/charts/fluent-bit-collector/values.yaml
@@ -301,9 +301,9 @@ hotReload:
   enabled: false
   image:
     # -- Image repository for the hot-reload sidecar container.
-    repository: cgr.dev/chainguard/configmap-reload
+    repository: ghcr.io/jimmidyson/configmap-reload
     # -- Image tag for the hot-reload sidecar container.
-    tag: latest
+    tag: v0.14.0
     # -- (string) Optional image digest for the hot-reload sidecar container.
     digest:
     # --  Image pull policy for the hot-reload sidecar container.

diff --git a/charts/nexus3/CHANGELOG.md b/charts/nexus3/CHANGELOG.md
@@ -14,6 +14,12 @@
 
 ## [UNRELEASED]
 
+## [v5.4.1] - 2024-11-05
+
+### Changed
+
+- Updated the config image to use `docker.io/alpine/k8s` as the _Chainguard_ image is no longer available. ([#1082](https://github.com/stevehipwell/helm-charts/pull/1082)) _@stevehipwell_
+
 ## [v5.4.0] - 2024-11-05
 
 ### Changed
@@ -751,6 +757,7 @@ RELEASE LINKS
 -->
 
 [UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/nexus3
+[v5.4.1]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.4.1
 [v5.4.0]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.4.0
 [v5.3.0]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.3.0
 [v5.2.0]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.2.0

diff --git a/charts/nexus3/Chart.yaml b/charts/nexus3/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: nexus3
 description: Helm chart for Sonatype Nexus 3 OSS.
 type: application
-version: 5.4.0
+version: 5.4.1
 appVersion: 3.74.0
 home: https://www.sonatype.com/products/sonatype-nexus-repository
 icon: https://raw.githubusercontent.com/stevehipwell/helm-charts/main/charts/nexus3/icon.png

diff --git a/charts/nexus3/README.md b/charts/nexus3/README.md
@@ -1,6 +1,6 @@
 # nexus3
 
-![Version: 5.4.0](https://img.shields.io/badge/Version-5.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.74.0](https://img.shields.io/badge/AppVersion-3.74.0-informational?style=flat-square)
+![Version: 5.4.1](https://img.shields.io/badge/Version-5.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.74.0](https://img.shields.io/badge/AppVersion-3.74.0-informational?style=flat-square)
 
 Helm chart for Sonatype Nexus 3 OSS.
 
@@ -25,15 +25,15 @@ Helm chart for Sonatype Nexus 3 OSS.
 To install the chart using the recommended OCI method you can use the following command.
 
 ```shell
-helm upgrade --install nexus3 oci://ghcr.io/stevehipwell/helm-charts/nexus3 --version 5.4.0
+helm upgrade --install nexus3 oci://ghcr.io/stevehipwell/helm-charts/nexus3 --version 5.4.1
 ```
 
 #### Verification
 
 As the OCI chart release is signed by [Cosign](https://github.com/sigstore/cosign) you can verify the chart before installing it by running the following command.
 
 ```shell
-cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/nexus3:5.4.0
+cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp 'https://github\.com/action-stars/helm-workflows/\.github/workflows/release\.yaml@.+' --certificate-github-workflow-repository stevehipwell/helm-charts --certificate-github-workflow-name Release ghcr.io/stevehipwell/helm-charts/nexus3:5.4.1
 ```
 
 ### Non-OCI Repository
@@ -42,7 +42,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
 
 ```shell
 helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
-helm upgrade --install nexus3 stevehipwell/nexus3 --version 5.4.0
+helm upgrade --install nexus3 stevehipwell/nexus3 --version 5.4.1
 ```
 
 ## Values
@@ -65,8 +65,8 @@ helm upgrade --install nexus3 stevehipwell/nexus3 --version 5.4.0
 | config.job.affinity | object | `{}` | Affinity settings for scheduling the config job. |
 | config.job.image.digest | string | `nil` | Optional image digest for the config container. |
 | config.job.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for config container. |
-| config.job.image.repository | string | `"cgr.dev/chainguard/min-toolkit-debug"` | Image repository for the config container. |
-| config.job.image.tag | string | `"latest"` | Image tag for config container, this will be omitted if set to `-`. |
+| config.job.image.repository | string | `"docker.io/alpine/k8s"` | Image repository for the config container. |
+| config.job.image.tag | string | `"1.31.2"` | Image tag for config container, this will be omitted if set to `-`. |
 | config.job.nodeSelector | object | `{}` | Node labels to match for scheduling the config job. |
 | config.job.tolerations | list | `[]` | Node taints which will be tolerated for scheduling the config job. |
 | config.job.ttlSecondsAfterFinished | int | `600` | The number of seconds to keep the config job after it's finished. |

diff --git a/charts/nexus3/values.yaml b/charts/nexus3/values.yaml
@@ -304,9 +304,9 @@ config:
   job:
     image:
       # -- Image repository for the config container.
-      repository: cgr.dev/chainguard/min-toolkit-debug
+      repository: docker.io/alpine/k8s
       # -- Image tag for config container, this will be omitted if set to `-`.
-      tag: latest
+      tag: 1.31.2
       # -- (string) Optional image digest for the config container.
       digest:
       # -- Image pull policy for config container.

diff --git a/charts/thanos/CHANGELOG.md b/charts/thanos/CHANGELOG.md
@@ -14,6 +14,12 @@
 
 ## [UNRELEASED]
 
+## [v1.18.2] - 2024-11-22
+
+### Changed
+
+- Updated configmap reload image to use `ghcr.io/jimmidyson/configmap-reload` as the _Chainguard_ image is no longer available. ([#1082](https://github.com/stevehipwell/helm-charts/pull/1082)) _@stevehipwell_
+
 ## [v1.18.1] - 2024-08-13
 
 ### Added
@@ -523,6 +529,7 @@
 RELEASE LINKS
 -->
 [UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/thanos
+[v1.18.2]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.18.2
 [v1.18.1]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.18.1
 [v1.18.0]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.18.0
 [v1.17.2]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.17.2

diff --git a/charts/thanos/Chart.yaml b/charts/thanos/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: thanos
 description: Helm chart to install Thanos; a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments.
 type: application
-version: 1.18.1
+version: 1.18.2
 appVersion: 0.36.1
 keywords:
   - kubernetes
@@ -22,13 +22,5 @@ maintainers:
     email: [email protected]
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: "Added support for setting the `unhealthyPodEvictionPolicy` value for the `PodDisruptionBudget` via the `<component>.podDisruptionBudget.unhealthyPodEvictionPolicy` value on _Kubernetes_ `1.27` or higher clusters."
-    - kind: added
-      description: "Added support for setting the `trafficDistribution` value for the _Query_ `Service` via the `query.service.trafficDistribution` value on _Kubernetes_ `1.31` or higher clusters."
-    - kind: added
-      description: "Added support for setting the `trafficDistribution` value for the _Query Frontend_ `Service` via the `queryFrontend.service.trafficDistribution` value on _Kubernetes_ `1.31` or higher clusters."
-    - kind: added
-      description: "Added support for setting the `trafficDistribution` value for the _Store Gateway_ `Service` via the `storeGateway.service.trafficDistribution` value on _Kubernetes_ `1.31` or higher clusters."
     - kind: changed
-      description: "Updated the _Thanos_ OCI image to [v0.36.1](https://github.com/thanos-io/thanos/releases/tag/v0.36.1)."
+      description: "Updated configmap reload image to use `ghcr.io/jimmidyson/configmap-reload` as the _Chainguard_ image is no longer available."