Merge branch 'master' into fix/fluentbit-ipv6

kube-logging · Nov 11, 2024 · de31710 · de31710
2 parents c7b228e + 39b50fe
commit de31710
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml
@@ -162,6 +162,9 @@ jobs:
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2 # 0.28.0
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2
+          TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:1
         with:
           input: image
           format: sarif
@@ -275,6 +278,9 @@ jobs:
 
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2 # 0.28.0
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:2
+          TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db:1
         with:
           scan-type: config
           scan-ref: charts/${{ steps.chart-name.outputs.value }}

diff --git 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
@@ -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
@@ -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
@@ -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/resources/configcheck/configcheck.go b/pkg/resources/configcheck/configcheck.go
@@ -46,11 +46,12 @@ type ConfigCheckCleaner struct {
 	labels client.MatchingLabels
 }
 
-func NewConfigCheckCleaner(c client.Client, component string) *ConfigCheckCleaner {
+func NewConfigCheckCleaner(c client.Client, component string, logging string) *ConfigCheckCleaner {
 	return &ConfigCheckCleaner{
 		client: c,
 		labels: client.MatchingLabels{
-			"app.kubernetes.io/component": component,
+			"app.kubernetes.io/component":  component,
+			"app.kubernetes.io/managed-by": logging,
 		},
 	}
 }

diff --git a/pkg/resources/fluentd/fluentd.go b/pkg/resources/fluentd/fluentd.go
@@ -168,7 +168,7 @@ func (r *Reconciler) Reconcile(ctx context.Context) (*reconcile.Result, error) {
 		}
 
 		if result, ok := r.Logging.Status.ConfigCheckResults[hash]; ok {
-			cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck)
+			cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck, r.Logging.GetName())
 
 			var cleanupErrs error
 			cleanupErrs = errors.Append(cleanupErrs, cleaner.SecretCleanup(ctx, hash))

diff --git a/pkg/resources/syslogng/syslogng.go b/pkg/resources/syslogng/syslogng.go
@@ -142,7 +142,7 @@ func (r *Reconciler) Reconcile(ctx context.Context) (*reconcile.Result, error) {
 
 		// Cleanup previous configcheck results
 		if result, ok := r.Logging.Status.ConfigCheckResults[hash]; ok {
-			cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck)
+			cleaner := configcheck.NewConfigCheckCleaner(r.Client, ComponentConfigCheck, r.Logging.GetName())
 
 			var cleanupErrs error
 			cleanupErrs = errors.Append(cleanupErrs, cleaner.SecretCleanup(ctx, hash))

diff --git 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"

diff --git 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.9.0"
 	configReloaderImageRepository     = "ghcr.io/kube-logging/syslogng-reload"
 	configReloaderImageTag            = "v1.5.0"
 	prometheusExporterImageRepository = "ghcr.io/axoflow/axosyslog-metrics-exporter"