Skip to content

Commit 6ba559f

Browse files
authored
fix: Fixed errors caused by the removal of free Chainguard images (#1082)
Signed-off-by: Steve Hipwell <[email protected]>
1 parent 7de51d5 commit 6ba559f

File tree

16 files changed

+67
-47
lines changed

16 files changed

+67
-47
lines changed

charts/fluent-bit-aggregator/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414

1515
## [UNRELEASED]
1616

17+
## [v0.16.1] - 2024-11-22
18+
19+
### Changed
20+
21+
- 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_
22+
1723
## [v0.16.0] - 2024-11-20
1824

1925
### Changed
@@ -308,6 +314,7 @@
308314
RELEASE LINKS
309315
-->
310316
[UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/fluent-bit-aggregator
317+
[v0.16.1]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-aggregator-0.16.1
311318
[v0.16.0]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-aggregator-0.16.0
312319
[v0.15.10]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-aggregator-0.15.10
313320
[v0.15.9]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-aggregator-0.15.9

charts/fluent-bit-aggregator/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: fluent-bit-aggregator
33
description: Helm chart for Fluent Bit running as an aggregation stateful set.
44
type: application
5-
version: 0.16.0
5+
version: 0.16.1
66
appVersion: 3.2.1
77
keywords:
88
- fluent
@@ -23,4 +23,4 @@ annotations:
2323
artifacthub.io/alternativeName: fluent-bit
2424
artifacthub.io/changes: |
2525
- kind: changed
26-
description: "Updated _Fluent Bit_ OCI image to [v3.2.1](https://github.com/fluent/fluent-bit/releases/tag/v3.2.1)."
26+
description: "Updated hot-reload image to use `ghcr.io/jimmidyson/configmap-reload` as the _Chainguard_ image is no longer available."

charts/fluent-bit-aggregator/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# fluent-bit-aggregator
22

3-
![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)
3+
![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)
44

55
Helm chart for Fluent Bit running as an aggregation stateful set.
66

@@ -24,15 +24,15 @@ Helm chart for Fluent Bit running as an aggregation stateful set.
2424
To install the chart using the recommended OCI method you can use the following command.
2525

2626
```shell
27-
helm upgrade --install fluent-bit-aggregator oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-aggregator --version 0.16.0
27+
helm upgrade --install fluent-bit-aggregator oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-aggregator --version 0.16.1
2828
```
2929

3030
#### Verification
3131

3232
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.
3333

3434
```shell
35-
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
35+
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
3636
```
3737

3838
### Non-OCI Repository
@@ -41,7 +41,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
4141

4242
```shell
4343
helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
44-
helm upgrade --install fluent-bit-aggregator stevehipwell/fluent-bit-aggregator --version 0.16.0
44+
helm upgrade --install fluent-bit-aggregator stevehipwell/fluent-bit-aggregator --version 0.16.1
4545
```
4646

4747
## Values
@@ -72,8 +72,8 @@ helm upgrade --install fluent-bit-aggregator stevehipwell/fluent-bit-aggregator
7272
| hotReload.enabled | bool | `false` | If `true`, enable [hot-reload](https://docs.fluentbit.io/manual/administration/hot-reload) via a sidecar container. |
7373
| hotReload.image.digest | string | `nil` | Optional image digest for the hot-reload sidecar container. |
7474
| hotReload.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the hot-reload sidecar container. |
75-
| hotReload.image.repository | string | `"cgr.dev/chainguard/configmap-reload"` | Image repository for the hot-reload sidecar container. |
76-
| hotReload.image.tag | string | `"latest"` | Image tag for the hot-reload sidecar container. |
75+
| hotReload.image.repository | string | `"ghcr.io/jimmidyson/configmap-reload"` | Image repository for the hot-reload sidecar container. |
76+
| hotReload.image.tag | string | `"v0.14.0"` | Image tag for the hot-reload sidecar container. |
7777
| hotReload.resources | object | `{}` | Resources for the hot-reload sidecar container. |
7878
| image.digest | string | `nil` | Optional image digest for the default container. |
7979
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the default container. |

charts/fluent-bit-aggregator/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,9 @@ hotReload:
317317
enabled: false
318318
image:
319319
# -- Image repository for the hot-reload sidecar container.
320-
repository: cgr.dev/chainguard/configmap-reload
320+
repository: ghcr.io/jimmidyson/configmap-reload
321321
# -- Image tag for the hot-reload sidecar container.
322-
tag: latest
322+
tag: v0.14.0
323323
# -- (string) Optional image digest for the hot-reload sidecar container.
324324
digest:
325325
# -- Image pull policy for the hot-reload sidecar container.

charts/fluent-bit-collector/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414

1515
## [UNRELEASED]
1616

17+
## [v0.13.1] - 2024-11-22
18+
19+
### Changed
20+
21+
- 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_
22+
1723
## [v0.13.0] - 2024-11-20
1824

1925
### Changed
@@ -245,6 +251,7 @@
245251
RELEASE LINKS
246252
-->
247253
[UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/fluent-bit-collector
254+
[v0.13.1]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-collector-0.13.1
248255
[v0.13.0]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-collector-0.13.0
249256
[v0.12.10]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-collector-0.12.10
250257
[v0.12.9]: https://github.com/stevehipwell/helm-charts/releases/tag/fluent-bit-collector-0.12.9

charts/fluent-bit-collector/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: fluent-bit-collector
33
description: Helm chart for Fluent Bit running as a collector DaemonSet.
44
type: application
5-
version: 0.13.0
5+
version: 0.13.1
66
appVersion: 3.2.1
77
keywords:
88
- fluent
@@ -23,4 +23,4 @@ annotations:
2323
artifacthub.io/alternativeName: fluent-bit
2424
artifacthub.io/changes: |
2525
- kind: changed
26-
description: "Updated _Fluent Bit_ OCI image to [v3.2.1](https://github.com/fluent/fluent-bit/releases/tag/v3.2.1)."
26+
description: "Updated hot-reload image to use `ghcr.io/jimmidyson/configmap-reload` as the _Chainguard_ image is no longer available."

charts/fluent-bit-collector/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# fluent-bit-collector
22

3-
![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)
3+
![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)
44

55
Helm chart for Fluent Bit running as a collector DaemonSet.
66

@@ -24,15 +24,15 @@ Helm chart for Fluent Bit running as a collector DaemonSet.
2424
To install the chart using the recommended OCI method you can use the following command.
2525

2626
```shell
27-
helm upgrade --install fluent-bit-collector oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-collector --version 0.13.0
27+
helm upgrade --install fluent-bit-collector oci://ghcr.io/stevehipwell/helm-charts/fluent-bit-collector --version 0.13.1
2828
```
2929

3030
#### Verification
3131

3232
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.
3333

3434
```shell
35-
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
35+
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
3636
```
3737

3838
### Non-OCI Repository
@@ -41,7 +41,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
4141

4242
```shell
4343
helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
44-
helm upgrade --install fluent-bit-collector stevehipwell/fluent-bit-collector --version 0.13.0
44+
helm upgrade --install fluent-bit-collector stevehipwell/fluent-bit-collector --version 0.13.1
4545
```
4646

4747
## Values
@@ -70,8 +70,8 @@ helm upgrade --install fluent-bit-collector stevehipwell/fluent-bit-collector --
7070
| hotReload.enabled | bool | `false` | If `true`, enable [hot-reload](https://docs.fluentbit.io/manual/administration/hot-reload) via a sidecar container. |
7171
| hotReload.image.digest | string | `nil` | Optional image digest for the hot-reload sidecar container. |
7272
| hotReload.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the hot-reload sidecar container. |
73-
| hotReload.image.repository | string | `"cgr.dev/chainguard/configmap-reload"` | Image repository for the hot-reload sidecar container. |
74-
| hotReload.image.tag | string | `"latest"` | Image tag for the hot-reload sidecar container. |
73+
| hotReload.image.repository | string | `"ghcr.io/jimmidyson/configmap-reload"` | Image repository for the hot-reload sidecar container. |
74+
| hotReload.image.tag | string | `"v0.14.0"` | Image tag for the hot-reload sidecar container. |
7575
| hotReload.resources | object | `{}` | Resources for the hot-reload sidecar container. |
7676
| image.digest | string | `nil` | Optional image digest for the default container. |
7777
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the default container. |

charts/fluent-bit-collector/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,9 @@ hotReload:
301301
enabled: false
302302
image:
303303
# -- Image repository for the hot-reload sidecar container.
304-
repository: cgr.dev/chainguard/configmap-reload
304+
repository: ghcr.io/jimmidyson/configmap-reload
305305
# -- Image tag for the hot-reload sidecar container.
306-
tag: latest
306+
tag: v0.14.0
307307
# -- (string) Optional image digest for the hot-reload sidecar container.
308308
digest:
309309
# -- Image pull policy for the hot-reload sidecar container.

charts/nexus3/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414

1515
## [UNRELEASED]
1616

17+
## [v5.4.1] - 2024-11-05
18+
19+
### Changed
20+
21+
- 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_
22+
1723
## [v5.4.0] - 2024-11-05
1824

1925
### Changed
@@ -751,6 +757,7 @@ RELEASE LINKS
751757
-->
752758

753759
[UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/nexus3
760+
[v5.4.1]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.4.1
754761
[v5.4.0]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.4.0
755762
[v5.3.0]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.3.0
756763
[v5.2.0]: https://github.com/stevehipwell/helm-charts/releases/tag/nexus3-5.2.0

charts/nexus3/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: nexus3
33
description: Helm chart for Sonatype Nexus 3 OSS.
44
type: application
5-
version: 5.4.0
5+
version: 5.4.1
66
appVersion: 3.74.0
77
home: https://www.sonatype.com/products/sonatype-nexus-repository
88
icon: https://raw.githubusercontent.com/stevehipwell/helm-charts/main/charts/nexus3/icon.png

charts/nexus3/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# nexus3
22

3-
![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)
3+
![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)
44

55
Helm chart for Sonatype Nexus 3 OSS.
66

@@ -25,15 +25,15 @@ Helm chart for Sonatype Nexus 3 OSS.
2525
To install the chart using the recommended OCI method you can use the following command.
2626

2727
```shell
28-
helm upgrade --install nexus3 oci://ghcr.io/stevehipwell/helm-charts/nexus3 --version 5.4.0
28+
helm upgrade --install nexus3 oci://ghcr.io/stevehipwell/helm-charts/nexus3 --version 5.4.1
2929
```
3030

3131
#### Verification
3232

3333
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.
3434

3535
```shell
36-
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
36+
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
3737
```
3838

3939
### Non-OCI Repository
@@ -42,7 +42,7 @@ Alternatively you can use the legacy non-OCI method via the following commands.
4242

4343
```shell
4444
helm repo add stevehipwell https://stevehipwell.github.io/helm-charts/
45-
helm upgrade --install nexus3 stevehipwell/nexus3 --version 5.4.0
45+
helm upgrade --install nexus3 stevehipwell/nexus3 --version 5.4.1
4646
```
4747

4848
## Values
@@ -65,8 +65,8 @@ helm upgrade --install nexus3 stevehipwell/nexus3 --version 5.4.0
6565
| config.job.affinity | object | `{}` | Affinity settings for scheduling the config job. |
6666
| config.job.image.digest | string | `nil` | Optional image digest for the config container. |
6767
| config.job.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for config container. |
68-
| config.job.image.repository | string | `"cgr.dev/chainguard/min-toolkit-debug"` | Image repository for the config container. |
69-
| config.job.image.tag | string | `"latest"` | Image tag for config container, this will be omitted if set to `-`. |
68+
| config.job.image.repository | string | `"docker.io/alpine/k8s"` | Image repository for the config container. |
69+
| config.job.image.tag | string | `"1.31.2"` | Image tag for config container, this will be omitted if set to `-`. |
7070
| config.job.nodeSelector | object | `{}` | Node labels to match for scheduling the config job. |
7171
| config.job.tolerations | list | `[]` | Node taints which will be tolerated for scheduling the config job. |
7272
| config.job.ttlSecondsAfterFinished | int | `600` | The number of seconds to keep the config job after it's finished. |

charts/nexus3/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,9 @@ config:
304304
job:
305305
image:
306306
# -- Image repository for the config container.
307-
repository: cgr.dev/chainguard/min-toolkit-debug
307+
repository: docker.io/alpine/k8s
308308
# -- Image tag for config container, this will be omitted if set to `-`.
309-
tag: latest
309+
tag: 1.31.2
310310
# -- (string) Optional image digest for the config container.
311311
digest:
312312
# -- Image pull policy for config container.

charts/thanos/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414

1515
## [UNRELEASED]
1616

17+
## [v1.18.2] - 2024-11-22
18+
19+
### Changed
20+
21+
- 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_
22+
1723
## [v1.18.1] - 2024-08-13
1824

1925
### Added
@@ -523,6 +529,7 @@
523529
RELEASE LINKS
524530
-->
525531
[UNRELEASED]: https://github.com/stevehipwell/helm-charts/tree/main/charts/thanos
532+
[v1.18.2]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.18.2
526533
[v1.18.1]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.18.1
527534
[v1.18.0]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.18.0
528535
[v1.17.2]: https://github.com/stevehipwell/helm-charts/releases/tag/thanos-1.17.2

charts/thanos/Chart.yaml

+2-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: thanos
33
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.
44
type: application
5-
version: 1.18.1
5+
version: 1.18.2
66
appVersion: 0.36.1
77
keywords:
88
- kubernetes
@@ -22,13 +22,5 @@ maintainers:
2222
2323
annotations:
2424
artifacthub.io/changes: |
25-
- kind: added
26-
description: "Added support for setting the `unhealthyPodEvictionPolicy` value for the `PodDisruptionBudget` via the `<component>.podDisruptionBudget.unhealthyPodEvictionPolicy` value on _Kubernetes_ `1.27` or higher clusters."
27-
- kind: added
28-
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."
29-
- kind: added
30-
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."
31-
- kind: added
32-
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."
3325
- kind: changed
34-
description: "Updated the _Thanos_ OCI image to [v0.36.1](https://github.com/thanos-io/thanos/releases/tag/v0.36.1)."
26+
description: "Updated configmap reload image to use `ghcr.io/jimmidyson/configmap-reload` as the _Chainguard_ image is no longer available."

0 commit comments

Comments
 (0)