fixup! only call setup function in BeforeClusterCreate

Author: dkoshkin

pkg/handlers/generic/lifecycle/registry/cncfdistribution/handler.go

@@ -64,6 +64,9 @@ func New(
 	}
 }
 
+// Setup ensures any pre-requisites for the CNCF Distribution registry addon are met.
+// It is expected to be called before the cluster is created.
+// Specifically, it ensures that the CA secret for the registry is created in the cluster's namespace.
 func (n *CNCFDistribution) Setup(
 	ctx context.Context,
 	_ v1alpha1.RegistryAddon,
@@ -82,23 +85,13 @@ func (n *CNCFDistribution) Setup(
 	return nil
 }
 
+// Apply applies the CNCF Distribution registry addon to the cluster.
 func (n *CNCFDistribution) Apply(
 	ctx context.Context,
 	_ v1alpha1.RegistryAddon,
 	cluster *clusterv1.Cluster,
 	log logr.Logger,
 ) error {
-	log.Info("Copying TLS Certificate for CNCF Distribution registry to remote cluster")
-	// Ensure the CA secret exists and is up to date in the cluster's namespace before trying to use it.
-	err := utils.EnsureCASecretForCluster(
-		ctx,
-		n.client,
-		cluster,
-	)
-	if err != nil {
-		return fmt.Errorf("failed to ensure CA secret for CNCF Distribution registry addon: %w", err)
-	}
-
 	// Copy the TLS secret to the remote cluster.
 	serviceIP, err := utils.ServiceIPForCluster(cluster)
 	if err != nil {

pkg/handlers/generic/lifecycle/registry/handler.go

@@ -92,7 +92,6 @@ func (r *RegistryHandler) BeforeClusterUpgrade(
 	resp *runtimehooksv1.BeforeClusterUpgradeResponse,
 ) {
 	commonResponse := &runtimehooksv1.CommonResponse{}
-	r.setup(ctx, &req.Cluster, commonResponse)
 	r.apply(ctx, &req.Cluster, commonResponse)
 	resp.Status = commonResponse.GetStatus()
 	resp.Message = commonResponse.GetMessage()