Skip to content

Commit

Permalink
chore: bump image versions
Browse files Browse the repository at this point in the history
Signed-off-by: Bence Csati <[email protected]>
  • Loading branch information
csatib02 committed Dec 3, 2024
1 parent 2f9b9b6 commit 2a4707b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
8 changes: 6 additions & 2 deletions e2e/common/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
4 changes: 2 additions & 2 deletions e2e/fluentd-aggregator/fluentd_aggregator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion e2e/volumedrain/volumedrain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/api/v1beta1/logging_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 2a4707b

Please sign in to comment.