Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for release 4.11 #1846

Merged
merged 2 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/common/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
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.9-base",
Tag: "v1.16-4.11-base",
},
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.9-base",
Tag: "v1.16-4.11-base",
},
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.9-base",
Tag: "v1.16-4.11-base",
},
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.9-base",
Tag: "v1.16-4.11-base",
},
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 @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/logging/api/v1beta1/syslogng_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading