Skip to content

Commit b2cb842

Browse files
committed
Fix: expose image config for fluentd-forwarder
1 parent 51a5ca8 commit b2cb842

File tree

5 files changed

+37
-2
lines changed

5 files changed

+37
-2
lines changed

changelog/0.44.md

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Released 2025-02-12
2929
- [#2348](https://github.com/elastisys/compliantkubernetes-apps/pull/2348) - apps sc: Added possibility to add additional receivers for alertmanager [@Xartos](https://github.com/Xartos)
3030
- [#2405](https://github.com/elastisys/compliantkubernetes-apps/pull/2405) - apps: Safeguard to prevent accidental cluster deletion [@Eliastisys](https://github.com/Eliastisys)
3131
- [#2425](https://github.com/elastisys/compliantkubernetes-apps/pull/2425) - Add GPU operator chart [@Ajarmar](https://github.com/Ajarmar)
32+
- [aab754c](https://github.com/elastisys/compliantkubernetes-apps/commit/aab754c3b68bfd9e3849f491c649bf8e0090047b) - Expose fluentd-forwarder image config [@lunkan93](https://github.com/lunkan93)
3233

3334
### Improvement(s)
3435

config/common-config.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,9 @@ fluentd:
255255
affinity: {}
256256

257257
forwarder:
258+
image:
259+
repository: ghcr.io/elastisys/fluentd-forwarder
260+
tag: v4.7.5-ck8s1
258261
buffer:
259262
totalLimitSize: 20GB
260263

config/schemas/config.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -5301,6 +5301,17 @@ properties:
53015301
type: object
53025302
additionalProperties: false
53035303
properties:
5304+
image:
5305+
title: Fluentd Forwarder Image Config
5306+
description: Configure Fluentd forwarder image repository and tag
5307+
type: object
5308+
properties:
5309+
repository:
5310+
default: ghcr.io/elastisys/fluentd-forwarder
5311+
type: string
5312+
tag:
5313+
default: v4.7.5-ck8s1
5314+
type: string
53045315
buffer:
53055316
$ref: '#/$defs/fluentdBuffer'
53065317
livenessThresholdSeconds:

helmfile.d/values/fluentd/forwarder-common.yaml.gotmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ image:
44
# This is our own fork-image (https://github.com/elastisys/fluentd-elasticsearch).
55
# This can later be replaced with the original image (https://github.com/monotek/fluentd-elasticsearch) when our changes is merged.
66
# This image is included in falco k8s_containers and user_known_package_manager_in_container macros
7-
repository: ghcr.io/elastisys/fluentd-forwarder
8-
tag: v4.7.5-ck8s1
7+
repository: {{ .Values.fluentd.forwarder.image.repository }}
8+
tag: {{ .Values.fluentd.forwarder.image.tag }}
99

1010
serviceMonitor:
1111
enabled: true

migration/v0.44/README.md

+20
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@ As with all scripts in this repository `CK8S_CONFIG_PATH` is expected to be set.
8282
./bin/ck8s upgrade wc v0.44 apply
8383
```
8484

85+
1. If the environment is still on Ubuntu 20.04, you may want to override the fluentd-forwarder image to the previous one, as the new image has some known issues on Ubuntu 20.04. This can be done in the `common-config.yaml`:
86+
87+
```yaml
88+
fluentd:
89+
forwarder:
90+
image:
91+
repository: ghcr.io/elastisys/fluentd
92+
tag: v4.3.9-ck8s1
93+
```
94+
8595
1. Apply upgrade - _disruptive_
8696

8797
> _Done during maintenance window._
@@ -109,6 +119,16 @@ As with all scripts in this repository `CK8S_CONFIG_PATH` is expected to be set.
109119
export CK8S_CLUSTER=<wc|sc|both>
110120
```
111121

122+
1. If the environment is still on Ubuntu 20.04, you may want to override the fluentd-forwarder image to the previous one, as the new image has some known issues on Ubuntu 20.04. This can be done in the `common-config.yaml`:
123+
124+
```yaml
125+
fluentd:
126+
forwarder:
127+
image:
128+
repository: ghcr.io/elastisys/fluentd
129+
tag: v4.3.9-ck8s1
130+
```
131+
112132
1. Because `harbor.core.replicas` was previously used by the jobservice component any nondefault value for it will be copied to `harbor.jobservice.replicas`:
113133

114134
```bash

0 commit comments

Comments
 (0)