encryption: fix unionrevisionedpod to match Deployer interface

pkg/operator/encryption/deployer/unionrevisionedpod.go

@@ -13,9 +13,10 @@ import (
 // UnionRevisionLabelPodDeployer provides unified state from multiple distinct deployers.
 type UnionRevisionLabelPodDeployer struct {
 	delegates []statemachine.Deployer
+	hasSynced []cache.InformerSynced
 }
 
-var _ statemachine.Deployer = &RevisionLabelPodDeployer{}
+var _ statemachine.Deployer = &UnionRevisionLabelPodDeployer{}
 
 // NewUnionRevisionLabelPodDeployer creates a deployer that returns a unified state from multiple distinct deployers.
 // That means:
@@ -67,13 +68,20 @@ func (d *UnionRevisionLabelPodDeployer) DeployedEncryptionConfigSecret() (secret
 	return goldenSecret, true, nil
 }
 
-// AddEventHandler registers a event handler that might influence the result of DeployedEncryptionConfigSecret for all configured deployers.
-func (d *UnionRevisionLabelPodDeployer) AddEventHandler(handler cache.ResourceEventHandler) []cache.InformerSynced {
-	ret := []cache.InformerSynced{}
+func (d *UnionRevisionLabelPodDeployer) HasSynced() bool {
+	for _, hasSynced := range d.hasSynced {
+		if !hasSynced() {
+			return false
+		}
+	}
+	return true
+}
 
+// AddEventHandler registers a event handler that might influence the result of DeployedEncryptionConfigSecret for all configured deployers.
+func (d *UnionRevisionLabelPodDeployer) AddEventHandler(handler cache.ResourceEventHandler) {
+	d.hasSynced = []cache.InformerSynced{}
 	for _, delegate := range d.delegates {
-		ret = append(ret, delegate.AddEventHandler(handler)...)
+		delegate.AddEventHandler(handler)
+		d.hasSynced = append(d.hasSynced, delegate.HasSynced)
 	}
-
-	return ret
 }

pkg/operator/encryption/deployer/unionrevisionedpod_test.go

@@ -150,6 +150,9 @@ func (d *fakeDeployer) DeployedEncryptionConfigSecret() (secret *corev1.Secret,
 	return d.secret, d.converged, d.err
 }
 
-func (d *fakeDeployer) AddEventHandler(handler cache.ResourceEventHandler) []cache.InformerSynced {
-	return nil
+func (d *fakeDeployer) AddEventHandler(handler cache.ResourceEventHandler) {
+}
+
+func (d *fakeDeployer) HasSynced() bool {
+	return true
 }

test/e2e-encryption/encryption_test.go

@@ -135,7 +135,7 @@ func TestEncryptionIntegration(tt *testing.T) {
 	fakeConfigInformer.Start(stopCh)
 	kubeInformers.Start(stopCh)
 	operatorInformer.Start(stopCh)
-	go controllers.Run(stopCh)
+	go controllers.Run(ctx, 1)
 
 	waitForConfigEventuallyCond := func(cond func(s string) bool) {
 		t.Helper()