diff --git a/e2e/common/helpers.go b/e2e/common/helpers.go index 82dfe8c32..48191058e 100644 --- a/e2e/common/helpers.go +++ b/e2e/common/helpers.go @@ -26,13 +26,17 @@ import ( "github.com/stretchr/testify/assert" v12 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1" "github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output" ) +const ( + FluentdImageTag = "v1.17-5.0-base" +) + var sequence uint32 func RequireNoError(t *testing.T, err error) { @@ -125,7 +129,7 @@ func LoggingInfra( ControlNamespace: nsInfra, FluentdSpec: &v1beta1.FluentdSpec{ Image: v1beta1.ImageSpec{ - Tag: "v1.16-4.11-base", + Tag: FluentdImageTag, }, 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 53fa6e0c6..d3bf64a17 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.11-base", + Tag: common.FluentdImageTag, }, 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 544b1f9aa..a03646de7 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.11-base", + Tag: common.FluentdImageTag, }, 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.11-base", + Tag: common.FluentdImageTag, }, Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ diff --git a/e2e/volumedrain/volumedrain_test.go b/e2e/volumedrain/volumedrain_test.go index 7f64cd626..17a01d17b 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.11-base", + Tag: common.FluentdImageTag, }, 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 cd496ef51..36bbd7921 100644 --- a/pkg/sdk/logging/api/v1beta1/logging_types.go +++ b/pkg/sdk/logging/api/v1beta1/logging_types.go @@ -180,7 +180,7 @@ const ( DefaultFluentbitConfigReloaderImageRepository = "ghcr.io/kube-logging/config-reloader" DefaultFluentbitConfigReloaderImageTag = "v0.0.6" DefaultFluentdImageRepository = "ghcr.io/kube-logging/fluentd" - DefaultFluentdImageTag = "v1.16-4.11-full" + DefaultFluentdImageTag = "v1.17-5.0-full" DefaultFluentdBufferStorageVolumeName = "fluentd-buffer" DefaultFluentdDrainWatchImageRepository = "ghcr.io/kube-logging/fluentd-drain-watch" DefaultFluentdDrainWatchImageTag = "v0.2.3"