Cherry pick changes to v1.147.1 (#175)

* Add a jitter to logrotate (#172)

Signed-off-by: Robin Schneider <mail@robinschneider.dev>

* Skip etcdEncryptionKeyRotation when cluster is hibernated (#173)

---------

Signed-off-by: Robin Schneider <mail@robinschneider.dev>
Co-authored-by: Robin Schneider <45321827+robinschneider@users.noreply.github.com>
Co-authored-by: Marcel Boehm <marcel.boehm@inovex.de>

Author: 3 people

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`),

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`),

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`),

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)