From e58551378ece3bf801926ec04bb81ea29a40675e Mon Sep 17 00:00:00 2001 From: Peter Wilcsinszky Date: Sun, 10 Nov 2024 07:43:49 +0100 Subject: [PATCH 1/2] chore: prepare for release with bumping fluentd image version Signed-off-by: Peter Wilcsinszky --- e2e/common/helpers.go | 2 +- .../fluentd_aggregator_test.go | 2 +- e2e/fluentd-aggregator/fluentd_aggregator_test.go | 4 ++-- e2e/volumedrain/volumedrain_test.go | 2 +- pkg/sdk/logging/api/v1beta1/logging_types.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/common/helpers.go b/e2e/common/helpers.go index 0f89a884b..82dfe8c32 100644 --- a/e2e/common/helpers.go +++ b/e2e/common/helpers.go @@ -125,7 +125,7 @@ func LoggingInfra( ControlNamespace: nsInfra, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.9-base", + Tag: "v1.16-4.11-base", }, DisablePvc: true, Resources: v12.ResourceRequirements{ diff --git a/e2e/fluentd-aggregator-namespacelabel/fluentd_aggregator_test.go b/e2e/fluentd-aggregator-namespacelabel/fluentd_aggregator_test.go index b26a5d623..53fa6e0c6 100644 --- a/e2e/fluentd-aggregator-namespacelabel/fluentd_aggregator_test.go +++ b/e2e/fluentd-aggregator-namespacelabel/fluentd_aggregator_test.go @@ -103,7 +103,7 @@ func TestFluentdAggregator_NamespaceLabel(t *testing.T) { }, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.9-base", + Tag: "v1.16-4.11-base", }, Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ diff --git a/e2e/fluentd-aggregator/fluentd_aggregator_test.go b/e2e/fluentd-aggregator/fluentd_aggregator_test.go index e485ff383..544b1f9aa 100644 --- a/e2e/fluentd-aggregator/fluentd_aggregator_test.go +++ b/e2e/fluentd-aggregator/fluentd_aggregator_test.go @@ -91,7 +91,7 @@ func TestFluentdAggregator_MultiWorker(t *testing.T) { }, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.9-base", + Tag: "v1.16-4.11-base", }, Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ @@ -259,7 +259,7 @@ func TestFluentdAggregator_ConfigChecks(t *testing.T) { }, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.9-base", + Tag: "v1.16-4.11-base", }, Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ diff --git a/e2e/volumedrain/volumedrain_test.go b/e2e/volumedrain/volumedrain_test.go index 2709e991b..7f64cd626 100644 --- a/e2e/volumedrain/volumedrain_test.go +++ b/e2e/volumedrain/volumedrain_test.go @@ -89,7 +89,7 @@ func TestVolumeDrain_Downscale(t *testing.T) { }, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.9-base", + Tag: "v1.16-4.11-base", }, Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ diff --git a/pkg/sdk/logging/api/v1beta1/logging_types.go b/pkg/sdk/logging/api/v1beta1/logging_types.go index faeb1c316..916995ddb 100644 --- a/pkg/sdk/logging/api/v1beta1/logging_types.go +++ b/pkg/sdk/logging/api/v1beta1/logging_types.go @@ -179,7 +179,7 @@ const ( DefaultFluentbitConfigReloaderImageRepository = "ghcr.io/kube-logging/config-reloader" DefaultFluentbitConfigReloaderImageTag = "v0.0.6" DefaultFluentdImageRepository = "ghcr.io/kube-logging/fluentd" - DefaultFluentdImageTag = "v1.16-4.10-full" + DefaultFluentdImageTag = "v1.16-4.11-full" DefaultFluentdBufferStorageVolumeName = "fluentd-buffer" DefaultFluentdDrainWatchImageRepository = "ghcr.io/kube-logging/fluentd-drain-watch" DefaultFluentdDrainWatchImageTag = "v0.2.3" From 0826736b2dc273d46c9336dfa3b2ec87bade918e Mon Sep 17 00:00:00 2001 From: Peter Wilcsinszky Date: Sun, 10 Nov 2024 07:44:42 +0100 Subject: [PATCH 2/2] chore: use moving image tag for axosyslog Signed-off-by: Peter Wilcsinszky --- pkg/sdk/logging/api/v1beta1/syslogng_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/sdk/logging/api/v1beta1/syslogng_types.go b/pkg/sdk/logging/api/v1beta1/syslogng_types.go index 2cabde194..de645f96f 100644 --- a/pkg/sdk/logging/api/v1beta1/syslogng_types.go +++ b/pkg/sdk/logging/api/v1beta1/syslogng_types.go @@ -34,7 +34,7 @@ type _metaSyslogNGSpec interface{} //nolint:deadcode,unused const ( defaultSyslogngImageRepository = "ghcr.io/axoflow/axosyslog" - defaultSyslogngImageTag = "4.8.1-1" + defaultSyslogngImageTag = "4.8.1" configReloaderImageRepository = "ghcr.io/kube-logging/syslogng-reload" configReloaderImageTag = "v1.5.0" prometheusExporterImageRepository = "ghcr.io/axoflow/axosyslog-metrics-exporter"