From f7e67dd778baa566702a178598df726ce3f8ae24 Mon Sep 17 00:00:00 2001 From: Robin Schneider <45321827+robinschneider@users.noreply.github.com> Date: Tue, 30 Jun 2026 16:27:52 +0200 Subject: [PATCH 1/2] Add a jitter to logrotate (#172) Signed-off-by: Robin Schneider --- .../original/components/containerd/component_test.go | 5 +++-- .../original/components/containerd/logrotate/logrotate.go | 5 +++-- .../components/containerd/logrotate/logrotate_test.go | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkg/component/extensions/operatingsystemconfig/original/components/containerd/component_test.go b/pkg/component/extensions/operatingsystemconfig/original/components/containerd/component_test.go index 6c65320a320..27eb18f41f5 100644 --- a/pkg/component/extensions/operatingsystemconfig/original/components/containerd/component_test.go +++ b/pkg/component/extensions/operatingsystemconfig/original/components/containerd/component_test.go @@ -48,10 +48,11 @@ WantedBy=multi-user.target`), Command: new(extensionsv1alpha1.CommandStart), Enable: new(true), Content: new(`[Unit] -Description=Log Rotation at each 10 minutes +Description=Log Rotation once a day [Timer] -OnCalendar=*:0/10 +OnCalendar=daily AccuracySec=1min +RandomizedDelaySec=4h Persistent=true [Install] WantedBy=multi-user.target`), diff --git a/pkg/component/extensions/operatingsystemconfig/original/components/containerd/logrotate/logrotate.go b/pkg/component/extensions/operatingsystemconfig/original/components/containerd/logrotate/logrotate.go index cff1fad74f2..9df0a7136dd 100644 --- a/pkg/component/extensions/operatingsystemconfig/original/components/containerd/logrotate/logrotate.go +++ b/pkg/component/extensions/operatingsystemconfig/original/components/containerd/logrotate/logrotate.go @@ -53,10 +53,11 @@ WantedBy=multi-user.target`), Command: new(extensionsv1alpha1.CommandStart), Enable: new(true), Content: new(`[Unit] -Description=Log Rotation at each 10 minutes +Description=Log Rotation once a day [Timer] -OnCalendar=*:0/10 +OnCalendar=daily AccuracySec=1min +RandomizedDelaySec=4h Persistent=true [Install] WantedBy=multi-user.target`), diff --git a/pkg/component/extensions/operatingsystemconfig/original/components/containerd/logrotate/logrotate_test.go b/pkg/component/extensions/operatingsystemconfig/original/components/containerd/logrotate/logrotate_test.go index e25ff9bbe3b..db77394f481 100644 --- a/pkg/component/extensions/operatingsystemconfig/original/components/containerd/logrotate/logrotate_test.go +++ b/pkg/component/extensions/operatingsystemconfig/original/components/containerd/logrotate/logrotate_test.go @@ -48,10 +48,11 @@ WantedBy=multi-user.target`), Command: new(extensionsv1alpha1.CommandStart), Enable: new(true), Content: new(`[Unit] -Description=Log Rotation at each 10 minutes +Description=Log Rotation once a day [Timer] -OnCalendar=*:0/10 +OnCalendar=daily AccuracySec=1min +RandomizedDelaySec=4h Persistent=true [Install] WantedBy=multi-user.target`), From 17b53720507b8c85290505d791ff10e234c90a94 Mon Sep 17 00:00:00 2001 From: Marcel Boehm Date: Tue, 7 Jul 2026 13:22:18 +0200 Subject: [PATCH 2/2] Skip etcdEncryptionKeyRotation when cluster is hibernated (#173) --- .../controller/shoot/maintenance/reconciler.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/controllermanager/controller/shoot/maintenance/reconciler.go b/pkg/controllermanager/controller/shoot/maintenance/reconciler.go index c716956d134..af535f5745b 100644 --- a/pkg/controllermanager/controller/shoot/maintenance/reconciler.go +++ b/pkg/controllermanager/controller/shoot/maintenance/reconciler.go @@ -691,7 +691,8 @@ func computeCredentialsToRotationResults(log logr.Logger, shoot *gardencorev1bet } if etcdEncryptionKeyRotationEnabled && - etcdEncryptionKeyRotationPassedRotationPeriod(shoot, now.Time, *shoot.Spec.Maintenance.AutoRotation.Credentials.ETCDEncryptionKey.RotationPeriod) { + etcdEncryptionKeyRotationPassedRotationPeriod(shoot, now.Time, *shoot.Spec.Maintenance.AutoRotation.Credentials.ETCDEncryptionKey.RotationPeriod) && + !v1beta1helper.HibernationIsEnabled(shoot) { if len(etcdEncryptionKeyRotationPhase) == 0 || etcdEncryptionKeyRotationPhase == gardencorev1beta1.RotationCompleted { reason := "Automatic rotation of etcd encryption key configured" log.Info("ETCD Encryption key will be rotated", "reason", reason)