Merge pull request #12921 from ivelichkovich/privatekeyflake

🌱 add DisableCertPrivateKey function for clustercache for test flake

Author: k8s-ci-robot

controllers/clustercache/cluster_accessor.go

@@ -82,6 +82,10 @@ type clusterAccessorConfig struct {
 	// connection after creating a connection failed.
 	ConnectionCreationRetryInterval time.Duration
 
+	// DisableClientCertificatePrivateKey is the flag to disable the creation of the client
+	// certificate private key.
+	DisableClientCertificatePrivateKey bool
+
 	// Cache is the config used for the cache that the clusterAccessor creates.
 	Cache *clusterAccessorCacheConfig
 
@@ -284,7 +288,7 @@ func (ca *clusterAccessor) Connect(ctx context.Context) (retErr error) {
 	// Only generate the clientCertificatePrivateKey once as there is no need to regenerate it after disconnect/connect.
 	// Note: This has to be done before setting connection, because otherwise this code wouldn't be re-entrant if the
 	// private key generation fails because we check Connected above.
-	if ca.lockedState.clientCertificatePrivateKey == nil {
+	if ca.lockedState.clientCertificatePrivateKey == nil && !ca.config.DisableClientCertificatePrivateKey {
 		log.V(6).Info("Generating client certificate private key")
 		clientCertificatePrivateKey, err := certs.NewPrivateKey()
 		if err != nil {

controllers/clustercache/cluster_cache.go

@@ -698,6 +698,12 @@ func (cc *clusterCache) SetConnectionCreationRetryInterval(interval time.Duratio
 	cc.clusterAccessorConfig.ConnectionCreationRetryInterval = interval
 }
 
+// DisablePrivateKeyGeneration can be used to disable the creation of cluster cert private key on clusteraccessor.
+// This method should only be used for tests and is not part of the public ClusterCache interface.
+func (cc *clusterCache) DisablePrivateKeyGeneration() {
+	cc.clusterAccessorConfig.DisableClientCertificatePrivateKey = true
+}
+
 // Shutdown can be used to shut down the ClusterCache in unit tests.
 // This method should only be used for tests because it hasn't been designed for production usage
 // in a manager (race conditions with manager shutdown etc.).

internal/controllers/machine/suite_test.go

@@ -96,6 +96,8 @@ func TestMain(m *testing.M) {
 		clusterCache.(interface{ SetConnectionCreationRetryInterval(time.Duration) }).
 			SetConnectionCreationRetryInterval(2 * time.Second)
 
+		clusterCache.(interface{ DisablePrivateKeyGeneration() }).DisablePrivateKeyGeneration()
+
 		if err := (&Reconciler{
 			Client:                           mgr.GetClient(),
 			APIReader:                        mgr.GetAPIReader(),