[squash me!] Remove context from the PropagationCfg struct

internal/controller/managedcluster_controller.go

@@ -651,19 +651,20 @@ func (r *ManagedClusterReconciler) reconcileCredentialPropagation(ctx context.Co
 		return fmt.Errorf("failed to get kubeconfig secret for cluster %s/%s: %w", managedCluster.Namespace, managedCluster.Name, err)
 	}
 
+	propnCfg := &credspropagation.PropagationCfg{
+		Client:          r.Client,
+		ManagedCluster:  managedCluster,
+		KubeconfSecret:  kubeconfSecret,
+		SystemNamespace: r.SystemNamespace,
+	}
+
 	for _, provider := range providers {
 		switch provider {
 		case "aws":
 			l.Info("Skipping creds propagation for AWS")
 		case "azure":
 			l.Info("Azure creds propagation start")
-			if err := credspropagation.PropagateAzureSecrets(credspropagation.PropagationCfg{
-				Ctx:             ctx,
-				Client:          r.Client,
-				ManagedCluster:  managedCluster,
-				KubeconfSecret:  kubeconfSecret,
-				SystemNamespace: r.SystemNamespace,
-			}); err != nil {
+			if err := credspropagation.PropagateAzureSecrets(ctx, propnCfg); err != nil {
 				errMsg := fmt.Sprintf("failed to create Azure CCM credentials: %s", err)
 				apimeta.SetStatusCondition(managedCluster.GetConditions(), metav1.Condition{
 					Type:    hmc.CredentialsPropagatedCondition,
@@ -683,13 +684,7 @@ func (r *ManagedClusterReconciler) reconcileCredentialPropagation(ctx context.Co
 			})
 		case "vsphere":
 			l.Info("vSphere creds propagation start")
-			if err := credspropagation.PropagateVSphereSecrets(credspropagation.PropagationCfg{
-				Ctx:             ctx,
-				Client:          r.Client,
-				ManagedCluster:  managedCluster,
-				KubeconfSecret:  kubeconfSecret,
-				SystemNamespace: r.SystemNamespace,
-			}); err != nil {
+			if err := credspropagation.PropagateVSphereSecrets(ctx, propnCfg); err != nil {
 				errMsg := fmt.Sprintf("failed to create vSphere CCM credentials: %s", err)
 				apimeta.SetStatusCondition(managedCluster.GetConditions(), metav1.Condition{
 					Type:    hmc.CredentialsPropagatedCondition,

internal/credspropagation/azure.go

@@ -15,6 +15,7 @@
 package credspropagation
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 
@@ -24,25 +25,25 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func PropagateAzureSecrets(cfg PropagationCfg) error {
+func PropagateAzureSecrets(ctx context.Context, cfg *PropagationCfg) error {
 	azureCluster := &capz.AzureCluster{}
-	if err := cfg.Client.Get(cfg.Ctx, client.ObjectKey{
+	if err := cfg.Client.Get(ctx, client.ObjectKey{
 		Name:      cfg.ManagedCluster.Name,
 		Namespace: cfg.ManagedCluster.Namespace,
 	}, azureCluster); err != nil {
 		return fmt.Errorf("failed to get AzureCluster %s: %w", cfg.ManagedCluster.Name, err)
 	}
 
 	azureClIdty := &capz.AzureClusterIdentity{}
-	if err := cfg.Client.Get(cfg.Ctx, client.ObjectKey{
+	if err := cfg.Client.Get(ctx, client.ObjectKey{
 		Name:      azureCluster.Spec.IdentityRef.Name,
 		Namespace: azureCluster.Spec.IdentityRef.Namespace,
 	}, azureClIdty); err != nil {
 		return fmt.Errorf("failed to get AzureClusterIdentity %s: %w", azureCluster.Spec.IdentityRef.Name, err)
 	}
 
 	azureSecret := &corev1.Secret{}
-	if err := cfg.Client.Get(cfg.Ctx, client.ObjectKey{
+	if err := cfg.Client.Get(ctx, client.ObjectKey{
 		Name:      azureClIdty.Spec.ClientSecret.Name,
 		Namespace: azureClIdty.Spec.ClientSecret.Namespace,
 	}, azureSecret); err != nil {
@@ -54,7 +55,7 @@ func PropagateAzureSecrets(cfg PropagationCfg) error {
 		return fmt.Errorf("failed to generate Azure CCM secret: %s", err)
 	}
 
-	if err := applyCCMConfigs(cfg.Ctx, cfg.KubeconfSecret, ccmSecret); err != nil {
+	if err := applyCCMConfigs(ctx, cfg.KubeconfSecret, ccmSecret); err != nil {
 		return fmt.Errorf("failed to apply Azure CCM secret: %s", err)
 	}
 

internal/credspropagation/common.go

@@ -29,7 +29,6 @@ import (
 )
 
 type PropagationCfg struct {
-	Ctx             context.Context
 	Client          client.Client
 	ManagedCluster  *hmc.ManagedCluster
 	KubeconfSecret  *corev1.Secret

internal/credspropagation/vsphere.go

@@ -16,6 +16,7 @@ package credspropagation
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	texttemplate "text/template"
 
@@ -29,24 +30,24 @@ import (
 	hmc "github.com/Mirantis/hmc/api/v1alpha1"
 )
 
-func PropagateVSphereSecrets(cfg PropagationCfg) error {
+func PropagateVSphereSecrets(ctx context.Context, cfg *PropagationCfg) error {
 	vsphereCluster := &capv.VSphereCluster{}
-	if err := cfg.Client.Get(cfg.Ctx, client.ObjectKey{
+	if err := cfg.Client.Get(ctx, client.ObjectKey{
 		Name:      cfg.ManagedCluster.Name,
 		Namespace: cfg.ManagedCluster.Namespace,
 	}, vsphereCluster); err != nil {
 		return fmt.Errorf("failed to get VSphereCluster %s: %w", cfg.ManagedCluster.Name, err)
 	}
 
 	vsphereClIdty := &capv.VSphereClusterIdentity{}
-	if err := cfg.Client.Get(cfg.Ctx, client.ObjectKey{
+	if err := cfg.Client.Get(ctx, client.ObjectKey{
 		Name: vsphereCluster.Spec.IdentityRef.Name,
 	}, vsphereClIdty); err != nil {
 		return fmt.Errorf("failed to get VSphereClusterIdentity %s: %w", vsphereCluster.Spec.IdentityRef.Name, err)
 	}
 
 	vsphereSecret := &corev1.Secret{}
-	if err := cfg.Client.Get(cfg.Ctx, client.ObjectKey{
+	if err := cfg.Client.Get(ctx, client.ObjectKey{
 		Name:      vsphereClIdty.Spec.SecretName,
 		Namespace: cfg.SystemNamespace,
 	}, vsphereSecret); err != nil {
@@ -55,7 +56,7 @@ func PropagateVSphereSecrets(cfg PropagationCfg) error {
 
 	vsphereMachines := &capv.VSphereMachineList{}
 	if err := cfg.Client.List(
-		cfg.Ctx,
+		ctx,
 		vsphereMachines,
 		&client.ListOptions{
 			Namespace: cfg.ManagedCluster.Namespace,
@@ -76,7 +77,7 @@ func PropagateVSphereSecrets(cfg PropagationCfg) error {
 		return fmt.Errorf("failed to generate VSphere CSI secret: %s", err)
 	}
 
-	if err := applyCCMConfigs(cfg.Ctx, cfg.KubeconfSecret, ccmSecret, ccmConfig, csiSecret); err != nil {
+	if err := applyCCMConfigs(ctx, cfg.KubeconfSecret, ccmSecret, ccmConfig, csiSecret); err != nil {
 		return fmt.Errorf("failed to apply VSphere CCM/CSI secrets: %s", err)
 	}