Skip to content

Commit

Permalink
feat(fluentd-aggregator): Updated image to v2.10.1
Browse files Browse the repository at this point in the history
Signed-off-by: Steve Hipwell <[email protected]>
  • Loading branch information
stevehipwell committed Dec 7, 2023
1 parent 8245635 commit fe16389
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 9 deletions.
11 changes: 11 additions & 0 deletions charts/fluentd-aggregator/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [UNRELEASED]

## [v4.1.1] - 2023-12-07

### Changed

- Updated _Fluentd Aggregator_ OCI image to [v2.10.1](https://github.com/stevehipwell/fluentd-aggregator/releases/tag/v2.10.1) (_Fluentd_ [v1.16.3](https://github.com/fluent/fluentd/releases/tag/v1.16.3)).

### Fixed

- Fixed legacy migration by adding `service.legacy` value to support keeping the legacy headless service name.
- Fixed incorrect truncation of names when full name is longer than `53` characters.

## [v4.1.0] - 2023-11-23

### Changed
Expand Down
10 changes: 7 additions & 3 deletions charts/fluentd-aggregator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: fluentd-aggregator
description: Helm chart for Fluentd running as an aggregation StatefulSet and using the fluent-plugin-route router.
type: application
version: 4.1.0
appVersion: 2.10.0
version: 4.1.1
appVersion: 2.10.1
keywords:
- fluent
- fluentd
Expand All @@ -22,4 +22,8 @@ annotations:
artifacthub.io/alternativeName: fluentd
artifacthub.io/changes: |
- kind: changed
description: "Updated _Fluentd Aggregator_ OCI image to [v2.10.0](https://github.com/stevehipwell/fluentd-aggregator/releases/tag/v2.10.0) (_Fluentd_ [v1.16.3](https://github.com/fluent/fluentd/releases/tag/v1.16.3))."
description: "Updated _Fluentd Aggregator_ OCI image to [v2.10.1](https://github.com/stevehipwell/fluentd-aggregator/releases/tag/v2.10.1) (_Fluentd_ [v1.16.3](https://github.com/fluent/fluentd/releases/tag/v1.16.3))."
- kind: fixed
description: "Fixed legacy migration by adding `service.legacy` value to support keeping the legacy headless service name."
- kind: fixed
description: "Fixed incorrect truncation of names when full name is longer than `53` characters."
7 changes: 4 additions & 3 deletions charts/fluentd-aggregator/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# fluentd-aggregator

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.10.0](https://img.shields.io/badge/AppVersion-2.10.0-informational?style=flat-square)
![Version: 4.1.1](https://img.shields.io/badge/Version-4.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.10.1](https://img.shields.io/badge/AppVersion-2.10.1-informational?style=flat-square)

Helm chart for Fluentd running as an aggregation StatefulSet and using the fluent-plugin-route router.

Expand All @@ -23,14 +23,14 @@ Helm chart for Fluentd running as an aggregation StatefulSet and using the fluen
To install the chart using the recommended OCI method you can use the following command.

```shell
helm upgrade --install fluentd-aggregator oci://ghcr.io/stevehipwell/helm-charts/fluentd-aggregator --version 4.1.0
helm upgrade --install fluentd-aggregator oci://ghcr.io/stevehipwell/helm-charts/fluentd-aggregator --version 4.1.1
```

Alternativly 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 fluentd-aggregator stevehipwell/fluentd-aggregator --version 4.1.0
helm upgrade --install fluentd-aggregator stevehipwell/fluentd-aggregator --version 4.1.1
```

## Values
Expand Down Expand Up @@ -92,6 +92,7 @@ helm upgrade --install fluentd-aggregator stevehipwell/fluentd-aggregator --vers
| service.additionalPorts | list | See _values.yaml_ | Additional ports to expose. |
| service.annotations | object | `{}` | Service annotations. |
| service.httpPort | int | `9880` | Fluentd port used for status. |
| service.legacy | bool | `false` | If `true`, use legacy naming so the headless service doesn't change. |
| service.metricsPort | int | `24231` | Fluentd port used for metrics. |
| service.type | string | `"ClusterIP"` | Service type. |
| serviceAccount.annotations | object | `{}` | Annotations to add to the service account. |
Expand Down
14 changes: 11 additions & 3 deletions charts/fluentd-aggregator/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -68,28 +68,36 @@ Create the name of the service account to use
Define the service name
*/}}
{{- define "fluentd-aggregator.serviceName" -}}
{{- if .Values.service.legacy }}
{{- (printf "%s-default" (include "fluentd-aggregator.fullname" .) | trunc 55 | trimSuffix "-") }}
{{- else }}
{{- include "fluentd-aggregator.fullname" . }}
{{- end }}
{{- end }}

{{/*
Define the headless service name
*/}}
{{- define "fluentd-aggregator.headlessServiceName" -}}
{{- (printf "%s-headless" (include "fluentd-aggregator.serviceName" .)) | trunc 63 | trimSuffix "-" }}
{{- if .Values.service.legacy }}
{{- include "fluentd-aggregator.fullname" . }}
{{- else }}
{{- (printf "%s-headless" (include "fluentd-aggregator.serviceName" .) | trunc 54 | trimSuffix "-") }}
{{- end }}
{{- end }}

{{/*
Define the config configmap name
*/}}
{{- define "fluentd-aggregator.configConfigMapName" -}}
{{- (printf "%s-config" (include "fluentd-aggregator.fullname" .)) | trunc 63 | trimSuffix "-" }}
{{- (printf "%s-config" (include "fluentd-aggregator.fullname" .) | trunc 56 | trimSuffix "-") }}
{{- end }}

{{/*
Define the dashboard configmap name
*/}}
{{- define "fluentd-aggregator.dashboardConfigMapName" -}}
{{- (printf "%s-dashboard" (include "fluentd-aggregator.fullname" .)) | trunc 63 | trimSuffix "-" }}
{{- (printf "%s-dashboard" (include "fluentd-aggregator.fullname" .) | trunc 53 | trimSuffix "-") }}
{{- end }}

{{/*
Expand Down
2 changes: 2 additions & 0 deletions charts/fluentd-aggregator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ service:
port: 24224
containerPort: 24224
protocol: TCP
# -- If `true`, use legacy naming so the headless service doesn't change.
legacy: false

# -- Ingresses, each input plugin will need it's own.
ingresses: []
Expand Down

0 comments on commit fe16389

Please sign in to comment.