diff --git a/cmd/cluster-capi-operator/main.go b/cmd/cluster-capi-operator/main.go index bc8168d48..4724e931a 100644 --- a/cmd/cluster-capi-operator/main.go +++ b/cmd/cluster-capi-operator/main.go @@ -107,12 +107,12 @@ func main() { managedNamespace := flag.String( "namespace", controllers.DefaultManagedNamespace, - "The namespace where CAPI components will run.", + "The namespace where Cluster API components will run.", ) imagesFile := flag.String( "images-json", defaultImagesLocation, - "The location of images file to use by operator for managed CAPI binaries.", + "The location of images file to use by operator for managed Cluster API binaries.", ) webhookPort := flag.Int( "webhook-port", diff --git a/cmd/machine-api-migration/main.go b/cmd/machine-api-migration/main.go index 81a16f577..f49e2ee23 100644 --- a/cmd/machine-api-migration/main.go +++ b/cmd/machine-api-migration/main.go @@ -88,12 +88,12 @@ func main() { capiManagedNamespace := flag.String( "capi-namespace", controllers.DefaultManagedNamespace, - "The namespace where CAPI components will run.", + "The namespace where Cluster API components will run.", ) mapiManagedNamespace := flag.String( "mapi-namespace", controllers.DefaultMAPIManagedNamespace, - "The namespace to watch for MAPI resources.", + "The namespace to watch for Machine API resources.", ) logToStderr := flag.Bool( diff --git a/e2e/aws_test.go b/e2e/aws_test.go index 2805031f6..ee0b1b4f2 100644 --- a/e2e/aws_test.go +++ b/e2e/aws_test.go @@ -241,7 +241,7 @@ func getCAPICreatedInstance(awsClient *ec2.EC2, msName string) ec2.Instance { } func compareInstances(awsClient *ec2.EC2, mapiMsName, capiMsName string) { - By("Comparing instances created by MAPI and CAPI") + By("Comparing instances created by Machine API and Cluster API") mapiEC2Instance := getMAPICreatedInstance(awsClient, mapiMsName) capiEC2Instance := getCAPICreatedInstance(awsClient, capiMsName) @@ -287,6 +287,6 @@ func compareInstances(awsClient *ec2.EC2, mapiMsName, capiMsName string) { } if !cmp.Equal(mapiEC2Instance, capiEC2Instance, cmpOpts...) { - GinkgoWriter.Print("Instances created by MAPI and CAPI are not equal\n" + cmp.Diff(mapiEC2Instance, capiEC2Instance, cmpOpts...)) + GinkgoWriter.Print("Instances created by Machine API and Cluster API are not equal\n" + cmp.Diff(mapiEC2Instance, capiEC2Instance, cmpOpts...)) } } diff --git a/pkg/controllers/capiinstaller/capi_installer_controller.go b/pkg/controllers/capiinstaller/capi_installer_controller.go index fb33e5aed..ae6f522a7 100644 --- a/pkg/controllers/capiinstaller/capi_installer_controller.go +++ b/pkg/controllers/capiinstaller/capi_installer_controller.go @@ -123,7 +123,7 @@ func (r *CapiInstallerController) reconcile(ctx context.Context, log logr.Logger // Process each one of the desired providers. for providerConfigMapLabelTypeVal, providerConfigMapLabelNameVal := range providerConfigMapLabels { - log.Info("reconciling CAPI provider", "name", providerConfigMapLabelNameVal) + log.Info("reconciling Cluster API provider", "name", providerConfigMapLabelNameVal) // Get a List all the ConfigMaps matching the desired provider labels. configMapList := &corev1.ConfigMapList{} @@ -137,14 +137,14 @@ func (r *CapiInstallerController) reconcile(ctx context.Context, log logr.Logger return ctrl.Result{}, fmt.Errorf("failed to set conditions for CAPI Installer controller: %w", err) } - return ctrl.Result{}, fmt.Errorf("unable to list CAPI provider %q ConfigMaps: %w", providerConfigMapLabelNameVal, err) + return ctrl.Result{}, fmt.Errorf("unable to list Cluster API provider %q ConfigMaps: %w", providerConfigMapLabelNameVal, err) } // Extract the provider manifests stored each of the matching ConfigMaps. var providerComponents []string for _, cm := range configMapList.Items { - log.Info("processing CAPI provider ConfigMap", "configmapName", cm.Name, "providerType", cm.Labels[providerConfigMapLabelTypeKey], + log.Info("processing Cluster API provider ConfigMap", "configmapName", cm.Name, "providerType", cm.Labels[providerConfigMapLabelTypeKey], "providerName", cm.Labels[providerConfigMapLabelNameKey], "providerVersion", cm.Labels[providerConfigMapLabelVersionKey]) partialComponents, err := r.extractProviderComponents(cm) @@ -153,7 +153,7 @@ func (r *CapiInstallerController) reconcile(ctx context.Context, log logr.Logger return ctrl.Result{}, fmt.Errorf("failed to set conditions for CAPI Installer controller: %w", err) } - return ctrl.Result{}, fmt.Errorf("error extracting CAPI provider components from ConfigMap %q/%q: %w", cm.Namespace, cm.Name, err) + return ctrl.Result{}, fmt.Errorf("error extracting Cluster API provider components from ConfigMap %q/%q: %w", cm.Namespace, cm.Name, err) } providerComponents = append(providerComponents, partialComponents...) @@ -165,10 +165,10 @@ func (r *CapiInstallerController) reconcile(ctx context.Context, log logr.Logger return ctrl.Result{}, fmt.Errorf("failed to set conditions for CAPI Installer controller: %w", err) } - return ctrl.Result{}, fmt.Errorf("error applying CAPI provider %q components: %w", providerConfigMapLabelNameVal, err) + return ctrl.Result{}, fmt.Errorf("error applying Cluster API provider %q components: %w", providerConfigMapLabelNameVal, err) } - log.Info("finished reconciling CAPI provider", "name", providerConfigMapLabelNameVal) + log.Info("finished reconciling Cluster API provider", "name", providerConfigMapLabelNameVal) } return ctrl.Result{}, nil @@ -201,7 +201,7 @@ func (r *CapiInstallerController) applyProviderComponents(ctx context.Context, c obj, err := yamlToRuntimeObject(r.Scheme, deploymentManifest) if err != nil { - return fmt.Errorf("error parsing CAPI provider deployment manifets %q: %w", d, err) + return fmt.Errorf("error parsing Cluster API provider deployment manifets %q: %w", d, err) } // TODO: Deployments State/Conditions should influence the overall ClusterOperator Status. @@ -217,7 +217,7 @@ func (r *CapiInstallerController) applyProviderComponents(ctx context.Context, c deployment, resourcemerge.ExpectedDeploymentGeneration(deployment, nil), ); err != nil { - return fmt.Errorf("error applying CAPI provider deployment %q: %w", deployment.Name, err) + return fmt.Errorf("error applying Cluster API provider deployment %q: %w", deployment.Name, err) } } @@ -225,7 +225,7 @@ func (r *CapiInstallerController) applyProviderComponents(ctx context.Context, c for i, r := range res { if r.Error != nil { - errs = errors.Join(errs, fmt.Errorf("error applying CAPI provider component %q at position %d: %w", r.File, i, r.Error)) + errs = errors.Join(errs, fmt.Errorf("error applying Cluster API provider component %q at position %d: %w", r.File, i, r.Error)) } } diff --git a/pkg/controllers/infracluster/azure.go b/pkg/controllers/infracluster/azure.go index 7a87fefb0..8c3edd3b9 100644 --- a/pkg/controllers/infracluster/azure.go +++ b/pkg/controllers/infracluster/azure.go @@ -35,7 +35,7 @@ import ( ) var ( - errUnableToGetAzureMAPIProviderSpec = errors.New("unable to get Azure MAPI ProviderSpec") + errUnableToGetAzureMAPIProviderSpec = errors.New("unable to get Azure Machine API ProviderSpec") errUnableToGetAzureClientID = errors.New("unable to get Azure Client ID") errUnableToGetAzureTenantID = errors.New("unable to get Azure Tenant ID") errPlatformStatusNil = errors.New("platform status should not be nil") @@ -79,12 +79,12 @@ func (r *InfraClusterController) ensureAzureCluster(ctx context.Context, log log func getAzureMAPIProviderSpec(ctx context.Context, cl client.Client) (*mapiv1beta1.AzureMachineProviderSpec, error) { rawProviderSpec, err := getRawMAPIProviderSpec(ctx, cl) if err != nil { - return nil, fmt.Errorf("unable to obtain MAPI ProviderSpec: %w", err) + return nil, fmt.Errorf("unable to obtain Machine API ProviderSpec: %w", err) } providerSpec := &mapiv1beta1.AzureMachineProviderSpec{} if err := yaml.Unmarshal(rawProviderSpec, providerSpec); err != nil { - return nil, fmt.Errorf("unable to unmarshal MAPI ProviderSpec: %w", err) + return nil, fmt.Errorf("unable to unmarshal Machine API ProviderSpec: %w", err) } return providerSpec, nil diff --git a/pkg/controllers/infracluster/gcp.go b/pkg/controllers/infracluster/gcp.go index 0d3cdc0cc..200690020 100644 --- a/pkg/controllers/infracluster/gcp.go +++ b/pkg/controllers/infracluster/gcp.go @@ -109,12 +109,12 @@ func (r *InfraClusterController) ensureGCPCluster(ctx context.Context, log logr. func getGCPMAPIProviderSpec(ctx context.Context, cl client.Client) (*mapiv1beta1.GCPMachineProviderSpec, error) { rawProviderSpec, err := getRawMAPIProviderSpec(ctx, cl) if err != nil { - return nil, fmt.Errorf("unable to obtain MAPI ProviderSpec: %w", err) + return nil, fmt.Errorf("unable to obtain Machine API ProviderSpec: %w", err) } providerSpec := &mapiv1beta1.GCPMachineProviderSpec{} if err := yaml.Unmarshal(rawProviderSpec, providerSpec); err != nil { - return nil, fmt.Errorf("unable to unmarshal MAPI ProviderSpec: %w", err) + return nil, fmt.Errorf("unable to unmarshal Machine API ProviderSpec: %w", err) } return providerSpec, nil @@ -126,7 +126,7 @@ func (r *InfraClusterController) getGCPProjectID(ctx context.Context) (string, e // Devise GCP Project ID via MAPI providerSpec. machineSpec, err := getGCPMAPIProviderSpec(ctx, r.Client) if err != nil || machineSpec == nil { - return "", fmt.Errorf("unable to get GCP MAPI ProviderSpec: %w", err) + return "", fmt.Errorf("unable to get GCP Machine API ProviderSpec: %w", err) } return machineSpec.ProjectID, nil diff --git a/pkg/controllers/infracluster/infracluster_controller.go b/pkg/controllers/infracluster/infracluster_controller.go index aa5c19e23..6391c31e1 100644 --- a/pkg/controllers/infracluster/infracluster_controller.go +++ b/pkg/controllers/infracluster/infracluster_controller.go @@ -67,7 +67,7 @@ var ( errPlatformNotSupported = errors.New("infrastructure platform is not supported") errCouldNotDeepCopyInfraObject = errors.New("unable to create a deep copy of InfraCluster object") errUnableToListMachineSets = errors.New("unable to list MachineSets") - errUnableToFindMachineSets = errors.New("unable to find any MachineSets to extract a MAPI ProviderSpec from") + errUnableToFindMachineSets = errors.New("unable to find any MachineSets to extract a Machine API ProviderSpec from") ) // InfraClusterController is a controller that manages infrastructure cluster objects. @@ -123,7 +123,7 @@ func (r *InfraClusterController) reconcileInfraCluster(ctx context.Context, log // This means, by definition, that the object is directly managed by CAPI infrastructure providers. // No action should be taken by this controller. log.Info(fmt.Sprintf("InfraCluster '%s/%s' does not have the externally managed-by annotation"+ - " - skipping as this is managed directly by the CAPI infrastructure provider", + " - skipping as this is managed directly by the Cluster API infrastructure provider", infraCluster.GetNamespace(), infraCluster.GetName())) return ctrl.Result{}, nil diff --git a/pkg/controllers/infracluster/powervs.go b/pkg/controllers/infracluster/powervs.go index d57d149c4..86e829c5b 100644 --- a/pkg/controllers/infracluster/powervs.go +++ b/pkg/controllers/infracluster/powervs.go @@ -79,7 +79,7 @@ func (r *InfraClusterController) ensureIBMPowerVSCluster(ctx context.Context, lo machineSpec, err := getPowerVSMAPIProviderSpec(ctx, r.Client) if err != nil { - return nil, fmt.Errorf("unable to get PowerVS MAPI ProviderSpec: %w", err) + return nil, fmt.Errorf("unable to get PowerVS Machine API ProviderSpec: %w", err) } serviceInstance, err := getPowerVSServiceInstance(machineSpec.ServiceInstance) @@ -125,12 +125,12 @@ func (r *InfraClusterController) ensureIBMPowerVSCluster(ctx context.Context, lo func getPowerVSMAPIProviderSpec(ctx context.Context, cl client.Client) (*mapiv1.PowerVSMachineProviderConfig, error) { rawProviderSpec, err := getRawMAPIProviderSpec(ctx, cl) if err != nil { - return nil, fmt.Errorf("unable to obtain MAPI ProviderSpec: %w", err) + return nil, fmt.Errorf("unable to obtain Machine API ProviderSpec: %w", err) } providerSpec := &mapiv1.PowerVSMachineProviderConfig{} if err := yaml.Unmarshal(rawProviderSpec, providerSpec); err != nil { - return nil, fmt.Errorf("unable to unmarshal MAPI ProviderSpec: %w", err) + return nil, fmt.Errorf("unable to unmarshal Machine API ProviderSpec: %w", err) } return providerSpec, nil diff --git a/pkg/controllers/infracluster/vsphere.go b/pkg/controllers/infracluster/vsphere.go index 5953d16bc..5e23b5922 100644 --- a/pkg/controllers/infracluster/vsphere.go +++ b/pkg/controllers/infracluster/vsphere.go @@ -50,7 +50,7 @@ func (r *InfraClusterController) ensureVSphereCluster(ctx context.Context, log l // First make sure the CAPI VSphere credentials secret exists. if err := r.ensureVSphereSecret(ctx, vsphereServerAddr); err != nil { - return nil, fmt.Errorf("unable to ensure CAPI VSphere credentials secret: %w", err) + return nil, fmt.Errorf("unable to ensure Cluster API VSphere credentials secret: %w", err) } target := &vspherev1.VSphereCluster{ObjectMeta: metav1.ObjectMeta{ @@ -117,12 +117,12 @@ func (r *InfraClusterController) ensureVSphereCluster(ctx context.Context, log l func getVSphereMAPIProviderSpec(ctx context.Context, cl client.Client) (*mapiv1beta1.VSphereMachineProviderSpec, error) { rawProviderSpec, err := getRawMAPIProviderSpec(ctx, cl) if err != nil { - return nil, fmt.Errorf("unable to obtain MAPI ProviderSpec: %w", err) + return nil, fmt.Errorf("unable to obtain Machine API ProviderSpec: %w", err) } providerSpec := &mapiv1beta1.VSphereMachineProviderSpec{} if err := yaml.Unmarshal(rawProviderSpec, providerSpec); err != nil { - return nil, fmt.Errorf("unable to unmarshal MAPI ProviderSpec: %w", err) + return nil, fmt.Errorf("unable to unmarshal Machine API ProviderSpec: %w", err) } return providerSpec, nil @@ -138,7 +138,7 @@ func (r *InfraClusterController) ensureVSphereSecret(ctx context.Context, vspher } if err := r.Client.Get(ctx, client.ObjectKeyFromObject(vSphereSecret), vSphereSecret); err != nil && !cerrors.IsNotFound(err) { - return fmt.Errorf("failed to get CAPI VSphere credentials secret: %w", err) + return fmt.Errorf("failed to get Cluster API VSphere credentials secret: %w", err) } else if err == nil { // The secret already exists. return nil @@ -155,7 +155,7 @@ func (r *InfraClusterController) ensureVSphereSecret(ctx context.Context, vspher } if err := r.Client.Create(ctx, vSphereSecret); err != nil && !cerrors.IsAlreadyExists(err) { - return fmt.Errorf("unable to create CAPI VSphere credentials secret: %w", err) + return fmt.Errorf("unable to create Cluster API VSphere credentials secret: %w", err) } return nil @@ -190,7 +190,7 @@ func (r *InfraClusterController) getVSphereServerAddr(ctx context.Context) (stri // Devise VSphere server addr via MAPI providerSpec. machineSpec, err := getVSphereMAPIProviderSpec(ctx, r.Client) if err != nil { - return "", fmt.Errorf("unable to get VSphere MAPI ProviderSpec: %w", err) + return "", fmt.Errorf("unable to get VSphere Machine API ProviderSpec: %w", err) } return machineSpec.Workspace.Server, nil diff --git a/pkg/controllers/machinesetsync/machineset_sync_controller.go b/pkg/controllers/machinesetsync/machineset_sync_controller.go index feff8abfc..ed9ea2d84 100644 --- a/pkg/controllers/machinesetsync/machineset_sync_controller.go +++ b/pkg/controllers/machinesetsync/machineset_sync_controller.go @@ -59,10 +59,10 @@ var ( errUnexpectedInfraClusterType = errors.New("unexpected InfraCluster type") // errAssertingCAPIAWSMachineTemplate is returned when we encounter an issue asserting a client.Object into a AWSMachineTemplate. - errAssertingCAPIAWSMachineTemplate = errors.New("error asserting the CAPI AWSMachineTemplate object") + errAssertingCAPIAWSMachineTemplate = errors.New("error asserting the Cluster API AWSMachineTemplate object") // errAssertingCAPIPowerVSMachineTemplate is returned when we encounter an issue asserting a client.Object into a IBMPowerVSMachineTemplate. - errAssertingCAPIIBMPowerVSMachineTemplate = errors.New("error asserting the CAPI IBMPowerVSMachineTemplate object") + errAssertingCAPIIBMPowerVSMachineTemplate = errors.New("error asserting the Cluster API IBMPowerVSMachineTemplate object") // errUnrecognizedConditionStatus is returned when the condition status is not recognized. errUnrecognizedConditionStatus = errors.New("error unrecognized condition status") @@ -80,8 +80,8 @@ const ( reasonFailedToGetCAPIMachineSet = "FailedToGetCAPIMachineSet" reasonResourceSynchronized = "ResourceSynchronized" - messageSuccessfullySynchronizedCAPItoMAPI = "Successfully synchronized CAPI MachineSet to MAPI" - messageSuccessfullySynchronizedMAPItoCAPI = "Successfully synchronized MAPI MachineSet to CAPI" + messageSuccessfullySynchronizedCAPItoMAPI = "Successfully synchronized Cluster API MachineSet to Machine API" + messageSuccessfullySynchronizedMAPItoCAPI = "Successfully synchronized Machine API MachineSet to Cluster API" controllerName string = "MachineSetSyncController" ) @@ -153,12 +153,12 @@ func (r *MachineSetSyncReconciler) Reconcile(ctx context.Context, req reconcile. } if mapiMachineSet == nil && capiMachineSet == nil { - logger.Info("Both MAPI and CAPI machine sets not found, nothing to do") + logger.Info("Both Machine API and Cluster API machine sets not found, nothing to do") return ctrl.Result{}, nil } if mapiMachineSet == nil { - logger.Info("Only CAPI machine set found, nothing to do") + logger.Info("Only Cluster API machine set found, nothing to do") return ctrl.Result{}, nil } @@ -174,19 +174,19 @@ func (r *MachineSetSyncReconciler) fetchMachineSets(ctx context.Context, name st capiMachineSet := &capiv1beta1.MachineSet{} if err := r.Get(ctx, client.ObjectKey{Namespace: r.MAPINamespace, Name: name}, mapiMachineSet); apierrors.IsNotFound(err) { - logger.Info("MAPI machine set not found") + logger.Info("Machine API machine set not found") mapiMachineSet = nil } else if err != nil { - return nil, nil, fmt.Errorf("failed to get MAPI machine set: %w", err) + return nil, nil, fmt.Errorf("failed to get Machine API machine set: %w", err) } if err := r.Get(ctx, client.ObjectKey{Namespace: r.CAPINamespace, Name: name}, capiMachineSet); apierrors.IsNotFound(err) { - logger.Info("CAPI machine set not found") + logger.Info("Cluster API machine set not found") capiMachineSet = nil } else if err != nil { - return nil, nil, fmt.Errorf("failed to get CAPI machine set: %w", err) + return nil, nil, fmt.Errorf("failed to get Cluster API machine set: %w", err) } return mapiMachineSet, capiMachineSet, nil @@ -209,15 +209,15 @@ func (r *MachineSetSyncReconciler) fetchCAPIInfraResources(ctx context.Context, infraMachineTemplate, infraCluster, err := initInfraMachineTemplateAndInfraClusterFromProvider(r.Platform) if err != nil { - return nil, nil, fmt.Errorf("unable to devise CAPI infra resources: %w", err) + return nil, nil, fmt.Errorf("unable to devise Cluster API infra resources: %w", err) } if err := r.Get(ctx, infraClusterKey, infraCluster); err != nil { - return nil, nil, fmt.Errorf("failed to get CAPI infrastructure cluster: %w", err) + return nil, nil, fmt.Errorf("failed to get Cluster API infrastructure cluster: %w", err) } if err := r.Get(ctx, infraMachineTemplateKey, infraMachineTemplate); err != nil { - return nil, nil, fmt.Errorf("failed to get CAPI infrastructure machine template: %w", err) + return nil, nil, fmt.Errorf("failed to get Cluster API infrastructure machine template: %w", err) } return infraCluster, infraMachineTemplate, nil @@ -253,7 +253,7 @@ func (r *MachineSetSyncReconciler) reconcileMAPIMachineSetToCAPIMachineSet(ctx c newCAPIMachineSet, newCAPIInfraMachineTemplate, warns, err := r.convertMAPIToCAPIMachineSet(mapiMachineSet) if err != nil { - conversionErr := fmt.Errorf("failed to convert MAPI machine set to CAPI machine set: %w", err) + conversionErr := fmt.Errorf("failed to convert Machine API machine set to Cluster API machine set: %w", err) if condErr := r.applySynchronizedConditionWithPatch(ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToConvertMAPIMachineSetToCAPI, conversionErr.Error(), nil); condErr != nil { return ctrl.Result{}, utilerrors.NewAggregate([]error{conversionErr, condErr}) } @@ -272,7 +272,7 @@ func (r *MachineSetSyncReconciler) reconcileMAPIMachineSetToCAPIMachineSet(ctx c _, infraMachineTemplate, err := r.fetchCAPIInfraResources(ctx, newCAPIMachineSet) if err != nil && !apierrors.IsNotFound(err) { - fetchErr := fmt.Errorf("failed to fetch CAPI infra resources: %w", err) + fetchErr := fmt.Errorf("failed to fetch Cluster API infra resources: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToGetCAPIInfraResources, fetchErr.Error(), nil); condErr != nil { @@ -286,11 +286,11 @@ func (r *MachineSetSyncReconciler) reconcileMAPIMachineSetToCAPIMachineSet(ctx c newCAPIInfraMachineTemplate.SetNamespace(r.CAPINamespace) if result, err := r.createOrUpdateCAPIInfraMachineTemplate(ctx, mapiMachineSet, infraMachineTemplate, newCAPIInfraMachineTemplate); err != nil { - return result, fmt.Errorf("unable to ensure CAPI infra machine template: %w", err) + return result, fmt.Errorf("unable to ensure Cluster API infra machine template: %w", err) } if result, err := r.createOrUpdateCAPIMachineSet(ctx, mapiMachineSet, capiMachineSet, newCAPIMachineSet); err != nil { - return result, fmt.Errorf("unable to ensure CAPI machine set: %w", err) + return result, fmt.Errorf("unable to ensure Cluster API machine set: %w", err) } return ctrl.Result{}, r.applySynchronizedConditionWithPatch(ctx, mapiMachineSet, corev1.ConditionTrue, @@ -304,7 +304,7 @@ func (r *MachineSetSyncReconciler) reconcileCAPIMachineSetToMAPIMachineSet(ctx c infraCluster, infraMachineTemplate, err := r.fetchCAPIInfraResources(ctx, capiMachineSet) if err != nil { - fetchErr := fmt.Errorf("failed to fetch CAPI infra resources: %w", err) + fetchErr := fmt.Errorf("failed to fetch Cluster API infra resources: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToGetCAPIInfraResources, fetchErr.Error(), nil); condErr != nil { @@ -316,7 +316,7 @@ func (r *MachineSetSyncReconciler) reconcileCAPIMachineSetToMAPIMachineSet(ctx c newMapiMachineSet, warns, err := r.convertCAPIToMAPIMachineSet(capiMachineSet, infraMachineTemplate, infraCluster) if err != nil { - conversionErr := fmt.Errorf("failed to convert CAPI machine set to MAPI machine set: %w", err) + conversionErr := fmt.Errorf("failed to convert Cluster API machine set to Machine API machine set: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToConvertCAPIMachineSetToMAPI, conversionErr.Error(), nil); condErr != nil { @@ -338,12 +338,12 @@ func (r *MachineSetSyncReconciler) reconcileCAPIMachineSetToMAPIMachineSet(ctx c mapiMachineSetsDiff := compareMAPIMachineSets(mapiMachineSet, newMapiMachineSet) if len(mapiMachineSetsDiff) > 0 { - logger.Info("Changes detected, updating MAPI machine set", "diff", mapiMachineSetsDiff) + logger.Info("Changes detected, updating Machine API machine set", "diff", mapiMachineSetsDiff) if err := r.Update(ctx, newMapiMachineSet); err != nil { - logger.Error(err, "Failed to update MAPI machine set") + logger.Error(err, "Failed to update Machine API machine set") - updateErr := fmt.Errorf("failed to update MAPI machine set: %w", err) + updateErr := fmt.Errorf("failed to update Machine API machine set: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToUpdateMAPIMachineSet, updateErr.Error(), nil); condErr != nil { @@ -353,9 +353,9 @@ func (r *MachineSetSyncReconciler) reconcileCAPIMachineSetToMAPIMachineSet(ctx c return ctrl.Result{}, updateErr } - logger.Info("Successfully updated MAPI machine set") + logger.Info("Successfully updated Machine API machine set") } else { - logger.Info("No changes detected in MAPI machine set") + logger.Info("No changes detected in Machine API machine set") } return ctrl.Result{}, r.applySynchronizedConditionWithPatch(ctx, mapiMachineSet, corev1.ConditionTrue, @@ -456,7 +456,7 @@ func (r *MachineSetSyncReconciler) applySynchronizedConditionWithPatch(ctx conte WithStatus(statusAc) if err := r.Status().Patch(ctx, mapiMachineSet, util.ApplyConfigPatch(msAc), client.ForceOwnership, client.FieldOwner(controllerName+"-SynchronizedCondition")); err != nil { - return fmt.Errorf("failed to patch MAPI machine set status with synchronized condition: %w", err) + return fmt.Errorf("failed to patch Machine API machine set status with synchronized condition: %w", err) } return nil @@ -468,8 +468,8 @@ func (r *MachineSetSyncReconciler) createOrUpdateCAPIInfraMachineTemplate(ctx co if infraMachineTemplate == nil { if err := r.Create(ctx, newCAPIInfraMachineTemplate); err != nil { - logger.Error(err, "Failed to create CAPI infra machine template") - createErr := fmt.Errorf("failed to create CAPI infra machine template: %w", err) + logger.Error(err, "Failed to create Cluster API infra machine template") + createErr := fmt.Errorf("failed to create Cluster API infra machine template: %w", err) if condErr := r.applySynchronizedConditionWithPatch(ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToCreateCAPIInfraMachineTemplate, createErr.Error(), nil); condErr != nil { return ctrl.Result{}, utilerrors.NewAggregate([]error{createErr, condErr}) @@ -478,15 +478,15 @@ func (r *MachineSetSyncReconciler) createOrUpdateCAPIInfraMachineTemplate(ctx co return ctrl.Result{}, createErr } - logger.Info("Successfully created CAPI infra machine template") + logger.Info("Successfully created Cluster API infra machine template") return ctrl.Result{}, nil } capiInfraMachineTemplatesDiff, err := compareCAPIInfraMachineTemplates(r.Platform, infraMachineTemplate, newCAPIInfraMachineTemplate) if err != nil { - logger.Error(err, "Failed to check CAPI infra machine template diff") - updateErr := fmt.Errorf("failed to check CAPI infra machine template diff: %w", err) + logger.Error(err, "Failed to check Cluster API infra machine template diff") + updateErr := fmt.Errorf("failed to check Cluster API infra machine template diff: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToUpdateCAPIInfraMachineTemplate, updateErr.Error(), nil); condErr != nil { @@ -497,16 +497,16 @@ func (r *MachineSetSyncReconciler) createOrUpdateCAPIInfraMachineTemplate(ctx co } if len(capiInfraMachineTemplatesDiff) == 0 { - logger.Info("No changes detected in CAPI infra machine template") + logger.Info("No changes detected in Cluster API infra machine template") return ctrl.Result{}, nil } - logger.Info("Changes detected, updating CAPI infra machine template", "diff", capiInfraMachineTemplatesDiff) + logger.Info("Changes detected, updating Cluster API infra machine template", "diff", capiInfraMachineTemplatesDiff) if err := r.Update(ctx, newCAPIInfraMachineTemplate); err != nil { - logger.Error(err, "Failed to update CAPI infra machine template") + logger.Error(err, "Failed to update Cluster API infra machine template") - updateErr := fmt.Errorf("failed to update CAPI infra machine template: %w", err) + updateErr := fmt.Errorf("failed to update Cluster API infra machine template: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToUpdateCAPIInfraMachineTemplate, updateErr.Error(), nil); condErr != nil { @@ -516,7 +516,7 @@ func (r *MachineSetSyncReconciler) createOrUpdateCAPIInfraMachineTemplate(ctx co return ctrl.Result{}, updateErr } - logger.Info("Successfully updated CAPI infra machine template") + logger.Info("Successfully updated Cluster API infra machine template") return ctrl.Result{}, nil } @@ -527,9 +527,9 @@ func (r *MachineSetSyncReconciler) createOrUpdateCAPIMachineSet(ctx context.Cont if capiMachineSet == nil { if err := r.Create(ctx, newCAPIMachineSet); err != nil { - logger.Error(err, "Failed to create CAPI machine set") + logger.Error(err, "Failed to create Cluster API machine set") - createErr := fmt.Errorf("failed to create CAPI machine set: %w", err) + createErr := fmt.Errorf("failed to create Cluster API machine set: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToCreateCAPIMachineSet, createErr.Error(), nil); condErr != nil { return ctrl.Result{}, utilerrors.NewAggregate([]error{createErr, condErr}) @@ -538,7 +538,7 @@ func (r *MachineSetSyncReconciler) createOrUpdateCAPIMachineSet(ctx context.Cont return ctrl.Result{}, createErr } - logger.Info("Successfully created CAPI machine set") + logger.Info("Successfully created Cluster API machine set") return ctrl.Result{}, nil } @@ -546,16 +546,16 @@ func (r *MachineSetSyncReconciler) createOrUpdateCAPIMachineSet(ctx context.Cont capiMachineSetsDiff := compareCAPIMachineSets(capiMachineSet, newCAPIMachineSet) if len(capiMachineSetsDiff) == 0 { - logger.Info("No changes detected in CAPI machine set") + logger.Info("No changes detected in Cluster API machine set") return ctrl.Result{}, nil } - logger.Info("Changes detected, updating CAPI machine set", "diff", capiMachineSetsDiff) + logger.Info("Changes detected, updating Cluster API machine set", "diff", capiMachineSetsDiff) if err := r.Update(ctx, newCAPIMachineSet); err != nil { - logger.Error(err, "Failed to update CAPI machine set") + logger.Error(err, "Failed to update Cluster API machine set") - updateErr := fmt.Errorf("failed to update CAPI machine set: %w", err) + updateErr := fmt.Errorf("failed to update Cluster API machine set: %w", err) if condErr := r.applySynchronizedConditionWithPatch(ctx, mapiMachineSet, corev1.ConditionFalse, reasonFailedToUpdateCAPIMachineSet, updateErr.Error(), nil); condErr != nil { return ctrl.Result{}, utilerrors.NewAggregate([]error{updateErr, condErr}) @@ -564,7 +564,7 @@ func (r *MachineSetSyncReconciler) createOrUpdateCAPIMachineSet(ctx context.Cont return ctrl.Result{}, updateErr } - logger.Info("Successfully updated CAPI machine set") + logger.Info("Successfully updated Cluster API machine set") return ctrl.Result{}, nil } diff --git a/pkg/controllers/machinesetsync/machineset_sync_controller_test.go b/pkg/controllers/machinesetsync/machineset_sync_controller_test.go index a3fa68cf7..9558c935d 100644 --- a/pkg/controllers/machinesetsync/machineset_sync_controller_test.go +++ b/pkg/controllers/machinesetsync/machineset_sync_controller_test.go @@ -215,7 +215,7 @@ var _ = Describe("With a running MachineSetSync controller", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI MachineSet to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API MachineSet to Cluster API")), ))), ) }) @@ -234,7 +234,7 @@ var _ = Describe("With a running MachineSetSync controller", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI MachineSet to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API MachineSet to Cluster API")), ))), ) }) @@ -380,7 +380,7 @@ var _ = Describe("With a running MachineSetSync controller", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI MachineSet to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API MachineSet to Cluster API")), ))), ) }) @@ -496,7 +496,7 @@ var _ = Describe("With a running MachineSetSync controller", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI MachineSet to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API MachineSet to Cluster API")), ))), ) }) @@ -520,7 +520,7 @@ var _ = Describe("With a running MachineSetSync controller", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI MachineSet to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API MachineSet to Cluster API")), ))), ) }) @@ -576,7 +576,7 @@ var _ = Describe("With a running MachineSetSync controller", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI MachineSet to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API MachineSet to Cluster API")), ))), ) }) @@ -702,7 +702,7 @@ var _ = Describe("applySynchronizedConditionWithPatch", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal(consts.ReasonResourceSynchronized)), - HaveField("Message", Equal("Successfully synchronized MAPI MachineSet to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API MachineSet to Cluster API")), HaveField("Severity", Equal(machinev1beta1.ConditionSeverityNone)), ))), ) diff --git a/pkg/controllers/machinesync/machine_sync_controller.go b/pkg/controllers/machinesync/machine_sync_controller.go index fce068352..d760515cb 100644 --- a/pkg/controllers/machinesync/machine_sync_controller.go +++ b/pkg/controllers/machinesync/machine_sync_controller.go @@ -49,10 +49,10 @@ import ( var ( // errAssertingCAPIAWSMachine is returned when we encounter an issue asserting a client.Object into a AWSMachine. - errAssertingCAPIAWSMachine = errors.New("error asserting the CAPI AWSMachine object") + errAssertingCAPIAWSMachine = errors.New("error asserting the Cluster API AWSMachine object") // errAssertingCAPIPowerVSMachine is returned when we encounter an issue asserting a client.Object into a IBMPowerVSMachine. - errAssertingCAPIIBMPowerVSMachine = errors.New("error asserting the CAPI IBMPowerVSMachine object") + errAssertingCAPIIBMPowerVSMachine = errors.New("error asserting the Cluster API IBMPowerVSMachine object") ) const ( @@ -69,9 +69,9 @@ const ( machineSetKind string = "MachineSet" controllerName string = "MachineSyncController" - messageSuccessfullySynchronizedCAPItoMAPI = "Successfully synchronized CAPI Machine to MAPI" - messageSuccessfullySynchronizedMAPItoCAPI = "Successfully synchronized MAPI Machine to CAPI" - progressingToSynchronizeMAPItoCAPI = "Progressing to synchronize MAPI Machine to CAPI" + messageSuccessfullySynchronizedCAPItoMAPI = "Successfully synchronized Cluster API Machine to Machine API" + messageSuccessfullySynchronizedMAPItoCAPI = "Successfully synchronized Machine API Machine to Cluster API" + progressingToSynchronizeMAPItoCAPI = "Progressing to synchronize Machine API Machine to Cluster API" ) var ( @@ -154,12 +154,12 @@ func (r *MachineSyncReconciler) Reconcile(ctx context.Context, req reconcile.Req } if err := r.Get(ctx, mapiNamespacedName, mapiMachine); apierrors.IsNotFound(err) { - logger.Info("MAPI Machine not found") + logger.Info("Machine API Machine not found") mapiMachineNotFound = true } else if err != nil { - logger.Error(err, "Failed to get MAPI Machine") - return ctrl.Result{}, fmt.Errorf("failed to get MAPI machine: %w", err) + logger.Error(err, "Failed to get Machine API Machine") + return ctrl.Result{}, fmt.Errorf("failed to get Machine API machine: %w", err) } // Get the corresponding CAPI Machine. @@ -170,17 +170,17 @@ func (r *MachineSyncReconciler) Reconcile(ctx context.Context, req reconcile.Req } if err := r.Get(ctx, capiNamespacedName, capiMachine); apierrors.IsNotFound(err) { - logger.Info("CAPI Machine not found") + logger.Info("Cluster API Machine not found") capiMachine = nil capiMachineNotFound = true } else if err != nil { - logger.Error(err, "Failed to get CAPI Machine") - return ctrl.Result{}, fmt.Errorf("failed to get CAPI machine:: %w", err) + logger.Error(err, "Failed to get Cluster API Machine") + return ctrl.Result{}, fmt.Errorf("failed to get Cluster API machine:: %w", err) } if mapiMachineNotFound && capiMachineNotFound { - logger.Info("CAPI and MAPI machines not found, nothing to do") + logger.Info("Cluster API and Machine API machines not found, nothing to do") return ctrl.Result{}, nil } @@ -219,7 +219,7 @@ func (r *MachineSyncReconciler) reconcileMAPIMachinetoCAPIMachine(ctx context.Co newCAPIMachine, newCAPIInfraMachine, warns, err := r.convertMAPIToCAPIMachine(mapiMachine) if err != nil { - conversionErr := fmt.Errorf("failed to convert MAPI machine to CAPI machine: %w", err) + conversionErr := fmt.Errorf("failed to convert Machine API machine to Cluster API machine: %w", err) if condErr := r.applySynchronizedConditionWithPatch(ctx, mapiMachine, corev1.ConditionFalse, reasonFailedToConvertMAPIMachineToCAPI, conversionErr.Error(), nil); condErr != nil { return ctrl.Result{}, utilerrors.NewAggregate([]error{conversionErr, condErr}) } @@ -238,7 +238,7 @@ func (r *MachineSyncReconciler) reconcileMAPIMachinetoCAPIMachine(ctx context.Co _, infraMachine, err := r.fetchCAPIInfraResources(ctx, newCAPIMachine) if err != nil && !apierrors.IsNotFound(err) { - fetchErr := fmt.Errorf("failed to fetch CAPI infra resources: %w", err) + fetchErr := fmt.Errorf("failed to fetch Cluster API infra resources: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachine, corev1.ConditionFalse, reasonFailedToGetCAPIInfraResources, fetchErr.Error(), nil); condErr != nil { @@ -260,11 +260,11 @@ func (r *MachineSyncReconciler) reconcileMAPIMachinetoCAPIMachine(ctx context.Co result, syncronizationIsProgressing, err := r.createOrUpdateCAPIInfraMachine(ctx, mapiMachine, infraMachine, newCAPIInfraMachine) if err != nil { - return result, fmt.Errorf("unable to ensure CAPI infra machine: %w", err) + return result, fmt.Errorf("unable to ensure Cluster API infra machine: %w", err) } if result, err := r.createOrUpdateCAPIMachine(ctx, mapiMachine, capiMachine, newCAPIMachine); err != nil { - return result, fmt.Errorf("unable to ensure CAPI machine: %w", err) + return result, fmt.Errorf("unable to ensure Cluster API machine: %w", err) } if syncronizationIsProgressing { @@ -300,8 +300,8 @@ func (r *MachineSyncReconciler) createOrUpdateCAPIInfraMachine(ctx context.Conte if infraMachine == nil { if err := r.Create(ctx, newCAPIInfraMachine); err != nil { - logger.Error(err, "Failed to create CAPI infra machine") - createErr := fmt.Errorf("failed to create CAPI infra machine: %w", err) + logger.Error(err, "Failed to create Cluster API infra machine") + createErr := fmt.Errorf("failed to create Cluster API infra machine: %w", err) if condErr := r.applySynchronizedConditionWithPatch(ctx, mapiMachine, corev1.ConditionFalse, reasonFailedToCreateCAPIInfraMachine, createErr.Error(), nil); condErr != nil { return ctrl.Result{}, syncronizationIsProgressing, utilerrors.NewAggregate([]error{createErr, condErr}) @@ -310,15 +310,15 @@ func (r *MachineSyncReconciler) createOrUpdateCAPIInfraMachine(ctx context.Conte return ctrl.Result{}, syncronizationIsProgressing, createErr } - logger.Info("Successfully created CAPI infra machine") + logger.Info("Successfully created Cluster API infra machine") return ctrl.Result{}, syncronizationIsProgressing, nil } capiInfraMachinesDiff, err := compareCAPIInfraMachines(r.Platform, infraMachine, newCAPIInfraMachine) if err != nil { - logger.Error(err, "Failed to check CAPI infra machine diff") - updateErr := fmt.Errorf("failed to check CAPI infra machine diff: %w", err) + logger.Error(err, "Failed to check Cluster API infra machine diff") + updateErr := fmt.Errorf("failed to check Cluster API infra machine diff: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachine, corev1.ConditionFalse, reasonFailedToUpdateCAPIInfraMachine, updateErr.Error(), nil); condErr != nil { @@ -329,16 +329,16 @@ func (r *MachineSyncReconciler) createOrUpdateCAPIInfraMachine(ctx context.Conte } if len(capiInfraMachinesDiff) == 0 { - logger.Info("No changes detected in CAPI infra machine") + logger.Info("No changes detected in Cluster API infra machine") return ctrl.Result{}, syncronizationIsProgressing, nil } - logger.Info("Deleting the corresponding CAPI infra machine as it is out of date, it will be recreated", "diff", capiInfraMachinesDiff) + logger.Info("Deleting the corresponding Cluster API infra machine as it is out of date, it will be recreated", "diff", capiInfraMachinesDiff) if err := r.Delete(ctx, infraMachine); err != nil { - logger.Error(err, "Failed to delete CAPI infra machine") + logger.Error(err, "Failed to delete Cluster API infra machine") - deleteErr := fmt.Errorf("failed to delete CAPI infra machine: %w", err) + deleteErr := fmt.Errorf("failed to delete Cluster API infra machine: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachine, corev1.ConditionFalse, reasonFailedToUpdateCAPIInfraMachine, deleteErr.Error(), nil); condErr != nil { @@ -350,7 +350,7 @@ func (r *MachineSyncReconciler) createOrUpdateCAPIInfraMachine(ctx context.Conte // The outdated outdated CAPI infra machine has been deleted. // We will try and recreate an up-to-date one later. - logger.Info("Successfully deleted outdated CAPI infra machine") + logger.Info("Successfully deleted outdated Cluster API infra machine") // Set the syncronized as progressing to signal the caller // we are still progressing and aren't fully synced yet. @@ -365,9 +365,9 @@ func (r *MachineSyncReconciler) createOrUpdateCAPIMachine(ctx context.Context, m if capiMachine == nil { if err := r.Create(ctx, newCAPIMachine); err != nil { - logger.Error(err, "Failed to create CAPI machine") + logger.Error(err, "Failed to create Cluster API machine") - createErr := fmt.Errorf("failed to create CAPI machine: %w", err) + createErr := fmt.Errorf("failed to create Cluster API machine: %w", err) if condErr := r.applySynchronizedConditionWithPatch( ctx, mapiMachine, corev1.ConditionFalse, reasonFailedToCreateCAPIMachine, createErr.Error(), nil); condErr != nil { return ctrl.Result{}, utilerrors.NewAggregate([]error{createErr, condErr}) @@ -376,7 +376,7 @@ func (r *MachineSyncReconciler) createOrUpdateCAPIMachine(ctx context.Context, m return ctrl.Result{}, createErr } - logger.Info("Successfully created CAPI machine") + logger.Info("Successfully created Cluster API machine") return ctrl.Result{}, nil } @@ -384,16 +384,16 @@ func (r *MachineSyncReconciler) createOrUpdateCAPIMachine(ctx context.Context, m capiMachinesDiff := compareCAPIMachines(capiMachine, newCAPIMachine) if len(capiMachinesDiff) == 0 { - logger.Info("No changes detected in CAPI machine") + logger.Info("No changes detected in Cluster API machine") return ctrl.Result{}, nil } - logger.Info("Changes detected, updating CAPI machine", "diff", capiMachinesDiff) + logger.Info("Changes detected, updating Cluster API machine", "diff", capiMachinesDiff) if err := r.Update(ctx, newCAPIMachine); err != nil { - logger.Error(err, "Failed to update CAPI machine") + logger.Error(err, "Failed to update Cluster API machine") - updateErr := fmt.Errorf("failed to update CAPI machine: %w", err) + updateErr := fmt.Errorf("failed to update Cluster API machine: %w", err) if condErr := r.applySynchronizedConditionWithPatch(ctx, mapiMachine, corev1.ConditionFalse, reasonFailedToUpdateCAPIMachine, updateErr.Error(), nil); condErr != nil { return ctrl.Result{}, utilerrors.NewAggregate([]error{updateErr, condErr}) @@ -402,7 +402,7 @@ func (r *MachineSyncReconciler) createOrUpdateCAPIMachine(ctx context.Context, m return ctrl.Result{}, updateErr } - logger.Info("Successfully updated CAPI machine") + logger.Info("Successfully updated Cluster API machine") return ctrl.Result{}, nil } @@ -429,7 +429,7 @@ func initInfraMachineAndInfraClusterFromProvider(platform configv1.PlatformType) // 2. That owning CAPI machineset has a MAPI machineset Mirror. func (r *MachineSyncReconciler) shouldMirrorCAPIMachineToMAPIMachine(ctx context.Context, logger logr.Logger, machine *capiv1beta1.Machine) (bool, error) { logger.WithName("shouldMirrorCAPIMachineToMAPIMachine"). - Info("checking if CAPI machine should be mirrored", "machine", machine.GetName()) + Info("checking if Cluster API machine should be mirrored", "machine", machine.GetName()) // Check if the CAPI machine has an ownerReference that points to a CAPI machineset. for _, ref := range machine.ObjectMeta.OwnerReferences { @@ -437,7 +437,7 @@ func (r *MachineSyncReconciler) shouldMirrorCAPIMachineToMAPIMachine(ctx context continue } - logger.Info("CAPI machine is owned by a CAPI machineset", "machine", machine.GetName(), "machineset", ref.Name) + logger.Info("CAPI machine is owned by a Cluster API machineset", "machine", machine.GetName(), "machineset", ref.Name) // Checks if the CAPI machineset has a MAPI machineset mirror (same name) in MAPI namespace. key := client.ObjectKey{ @@ -447,19 +447,19 @@ func (r *MachineSyncReconciler) shouldMirrorCAPIMachineToMAPIMachine(ctx context mapiMachineSet := &machinev1beta1.MachineSet{} if err := r.Get(ctx, key, mapiMachineSet); apierrors.IsNotFound(err) { - logger.Info("MAPI machineset mirror not found for the CAPI machineset, nothing to do", "machine", machine.GetName(), "machineset", ref.Name) + logger.Info("Machine API machineset mirror not found for the Cluster API machineset, nothing to do", "machine", machine.GetName(), "machineset", ref.Name) return false, nil } else if err != nil { - logger.Error(err, "Failed to get MAPI machineset mirror") + logger.Error(err, "Failed to get Machine API machineset mirror") - return false, fmt.Errorf("failed to get MAPI machineset: %w", err) + return false, fmt.Errorf("failed to get Machine API machineset: %w", err) } return true, nil } - logger.Info("CAPI machine is not owned by a machineset, nothing to do", "machine", machine.GetName()) + logger.Info("Cluster API machine is not owned by a machineset, nothing to do", "machine", machine.GetName()) return false, nil } @@ -481,15 +481,15 @@ func (r *MachineSyncReconciler) fetchCAPIInfraResources(ctx context.Context, cap infraMachine, infraCluster, err := initInfraMachineAndInfraClusterFromProvider(r.Platform) if err != nil { - return nil, nil, fmt.Errorf("unable to devise CAPI infra resources: %w", err) + return nil, nil, fmt.Errorf("unable to devise Cluster API infra resources: %w", err) } if err := r.Get(ctx, infraClusterKey, infraCluster); err != nil { - return nil, nil, fmt.Errorf("failed to get CAPI infrastructure cluster: %w", err) + return nil, nil, fmt.Errorf("failed to get Cluster API infrastructure cluster: %w", err) } if err := r.Get(ctx, infraMachineKey, infraMachine); err != nil { - return nil, nil, fmt.Errorf("failed to get CAPI infrastructure machine: %w", err) + return nil, nil, fmt.Errorf("failed to get Cluster API infrastructure machine: %w", err) } return infraCluster, infraMachine, nil @@ -590,7 +590,7 @@ func (r *MachineSyncReconciler) applySynchronizedConditionWithPatch(ctx context. WithStatus(statusAc) if err := r.Status().Patch(ctx, mapiMachine, util.ApplyConfigPatch(msAc), client.ForceOwnership, client.FieldOwner(controllerName+"-SynchronizedCondition")); err != nil { - return fmt.Errorf("failed to patch MAPI machine status with synchronized condition: %w", err) + return fmt.Errorf("failed to patch Machine API machine status with synchronized condition: %w", err) } return nil diff --git a/pkg/controllers/machinesync/machine_sync_controller_test.go b/pkg/controllers/machinesync/machine_sync_controller_test.go index bbeb4efe9..0df62b7d1 100644 --- a/pkg/controllers/machinesync/machine_sync_controller_test.go +++ b/pkg/controllers/machinesync/machine_sync_controller_test.go @@ -209,7 +209,7 @@ var _ = Describe("With a running MachineSync Reconciler", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI Machine to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API Machine to Cluster API")), ))), ) }) @@ -228,7 +228,7 @@ var _ = Describe("With a running MachineSync Reconciler", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI Machine to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API Machine to Cluster API")), ))), ) }) @@ -265,7 +265,7 @@ var _ = Describe("With a running MachineSync Reconciler", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI Machine to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API Machine to Cluster API")), ))), ) }) @@ -381,7 +381,7 @@ var _ = Describe("With a running MachineSync Reconciler", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI Machine to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API Machine to Cluster API")), ))), ) }) @@ -405,7 +405,7 @@ var _ = Describe("With a running MachineSync Reconciler", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal("ResourceSynchronized")), - HaveField("Message", Equal("Successfully synchronized MAPI Machine to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API Machine to Cluster API")), ))), ) }) @@ -504,7 +504,7 @@ var _ = Describe("applySynchronizedConditionWithPatch", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionUnknown)), HaveField("Reason", Equal("ProgressingToCreateCAPIInfraMachine")), - HaveField("Message", Equal("Progressing to synchronize MAPI Machine to CAPI")), + HaveField("Message", Equal("Progressing to synchronize Machine API Machine to Cluster API")), HaveField("Severity", Equal(machinev1beta1.ConditionSeverityInfo)), ))), ) @@ -530,7 +530,7 @@ var _ = Describe("applySynchronizedConditionWithPatch", func() { HaveField("Type", Equal(consts.SynchronizedCondition)), HaveField("Status", Equal(corev1.ConditionTrue)), HaveField("Reason", Equal(consts.ReasonResourceSynchronized)), - HaveField("Message", Equal("Successfully synchronized MAPI Machine to CAPI")), + HaveField("Message", Equal("Successfully synchronized Machine API Machine to Cluster API")), HaveField("Severity", Equal(machinev1beta1.ConditionSeverityNone)), ))), ) diff --git a/pkg/conversion/capi2mapi/powervs.go b/pkg/conversion/capi2mapi/powervs.go index 85491f4c9..ff089706f 100644 --- a/pkg/conversion/capi2mapi/powervs.go +++ b/pkg/conversion/capi2mapi/powervs.go @@ -230,7 +230,7 @@ func convertPowerVSNetworkToMAPI(fldPath *field.Path, network capibmv1.IBMPowerV return networkResource, nil } - return networkResource, field.Invalid(fldPath, network, "unable to convert network to MAPI") + return networkResource, field.Invalid(fldPath, network, "unable to convert network to Machine API") } func convertPowerVSImageToMAPI(fldPath *field.Path, image *capibmv1.IBMPowerVSResourceReference, imageRef *corev1.LocalObjectReference) (mapiv1.PowerVSResource, *field.Error) { @@ -301,5 +301,5 @@ func convertPowerVSServiceInstanceToMAPI(fldPath *field.Path, serviceInstanceID return serviceInstanceResource, nil } - return serviceInstanceResource, field.Invalid(fldPath, serviceInstance, "unable to convert service instance to MAPI") + return serviceInstanceResource, field.Invalid(fldPath, serviceInstance, "unable to convert service instance to Machine API") } diff --git a/pkg/conversion/capi2mapi/powervs_test.go b/pkg/conversion/capi2mapi/powervs_test.go index 952b70d36..cf58b1fa8 100644 --- a/pkg/conversion/capi2mapi/powervs_test.go +++ b/pkg/conversion/capi2mapi/powervs_test.go @@ -147,7 +147,7 @@ var _ = Describe("capi2mapi PowerVS conversion", func() { return &pvsMachine }, powerVSCluster: powerVSCluster, - expectedErrors: []string{"spec.network: Invalid value: v1beta2.IBMPowerVSResourceReference{ID:(*string)(nil), Name:(*string)(nil), RegEx:(*string)(nil)}: unable to convert network to MAPI"}, + expectedErrors: []string{"spec.network: Invalid value: v1beta2.IBMPowerVSResourceReference{ID:(*string)(nil), Name:(*string)(nil), RegEx:(*string)(nil)}: unable to convert network to Machine API"}, }), ) diff --git a/pkg/conversion/mapi2capi/aws.go b/pkg/conversion/mapi2capi/aws.go index 545d75798..c503df7af 100644 --- a/pkg/conversion/mapi2capi/aws.go +++ b/pkg/conversion/mapi2capi/aws.go @@ -364,11 +364,11 @@ func awsMachineToAWSMachineTemplate(awsMachine *capav1.AWSMachine, name string, func convertAWSAMIResourceReferenceToCAPI(fldPath *field.Path, amiRef mapiv1.AWSResourceReference) (capav1.AMIReference, *field.Error) { if amiRef.ARN != nil { - return capav1.AMIReference{}, field.Invalid(fldPath.Child("arn"), amiRef.ARN, "unable to convert AMI ARN reference. Not supported in CAPI") + return capav1.AMIReference{}, field.Invalid(fldPath.Child("arn"), amiRef.ARN, "unable to convert AMI ARN reference. Not supported in Cluster API") } if len(amiRef.Filters) > 0 { - return capav1.AMIReference{}, field.Invalid(fldPath.Child("filters"), amiRef.Filters, "unable to convert AMI Filters reference. Not supported in CAPI") + return capav1.AMIReference{}, field.Invalid(fldPath.Child("filters"), amiRef.Filters, "unable to convert AMI Filters reference. Not supported in Cluster API") } if amiRef.ID != nil { diff --git a/pkg/conversion/mapi2capi/aws_test.go b/pkg/conversion/mapi2capi/aws_test.go index a2d368799..ca3462e88 100644 --- a/pkg/conversion/mapi2capi/aws_test.go +++ b/pkg/conversion/mapi2capi/aws_test.go @@ -81,8 +81,8 @@ var _ = Describe("mapi2capi AWS conversion", func() { var _ = DescribeTable("mapi2capi AWS convert MAPI Machine", func(in awsMAPI2CAPIConversionInput) { _, _, warns, err := FromAWSMachineAndInfra(in.machineBuilder.Build(), in.infra).ToMachineAndInfrastructureMachine() - Expect(err).To(matchers.ConsistOfMatchErrorSubstrings(in.expectedErrors), "should match expected errors while converting an AWS MAPI Machine to CAPI") - Expect(warns).To(matchers.ConsistOfSubstrings(in.expectedWarnings), "should match expected warnings while converting an AWS MAPI Machine to CAPI") + Expect(err).To(matchers.ConsistOfMatchErrorSubstrings(in.expectedErrors), "should match expected errors while converting an AWS Machine API Machine to Cluster API") + Expect(warns).To(matchers.ConsistOfSubstrings(in.expectedWarnings), "should match expected warnings while converting an AWS Machine API Machine to Cluster API") }, // Base Case. @@ -139,7 +139,7 @@ var _ = Describe("mapi2capi AWS conversion", func() { " ResourceVersion:\"\", Generation:0, CreationTimestamp:time.Date(1, time.January, 1, 0, 0, 0, 0, time.UTC), DeletionTimestamp:," + " DeletionGracePeriodSeconds:(*int64)(nil), Labels:map[string]string(nil), Annotations:map[string]string(nil)," + " OwnerReferences:[]v1.OwnerReference(nil), Finalizers:[]string(nil), ManagedFields:[]v1.ManagedFieldsEntry(nil)}: metadata is not supported", - "spec.providerSpec.value.ami.arn: Invalid value: \"arn:aws:ec2:us-east-1::image/ami-1234567890abcdef0\": unable to convert AMI ARN reference. Not supported in CAPI", + "spec.providerSpec.value.ami.arn: Invalid value: \"arn:aws:ec2:us-east-1::image/ami-1234567890abcdef0\": unable to convert AMI ARN reference. Not supported in Cluster API", }, expectedWarnings: []string{}, }), @@ -161,7 +161,7 @@ var _ = Describe("mapi2capi AWS conversion", func() { ), infra: infra, expectedErrors: []string{ - "spec.providerSpec.value.ami.arn: Invalid value: \"arn:aws:ec2:us-east-1::image/ami-1234567890abcdef0\": unable to convert AMI ARN reference. Not supported in CAPI", + "spec.providerSpec.value.ami.arn: Invalid value: \"arn:aws:ec2:us-east-1::image/ami-1234567890abcdef0\": unable to convert AMI ARN reference. Not supported in Cluster API", }, expectedWarnings: []string{}, }), @@ -173,7 +173,7 @@ var _ = Describe("mapi2capi AWS conversion", func() { ), infra: infra, expectedErrors: []string{ - "spec.providerSpec.value.ami.filters: Invalid value: []v1beta1.Filter{v1beta1.Filter{Name:\"name\", Values:[]string{\"test\"}}}: unable to convert AMI Filters reference. Not supported in CAPI", + "spec.providerSpec.value.ami.filters: Invalid value: []v1beta1.Filter{v1beta1.Filter{Name:\"name\", Values:[]string{\"test\"}}}: unable to convert AMI Filters reference. Not supported in Cluster API", }, expectedWarnings: []string{}, }), @@ -323,8 +323,8 @@ var _ = Describe("mapi2capi AWS conversion", func() { var _ = DescribeTable("mapi2capi AWS convert MAPI MachineSet", func(in awsMAPI2CAPIMachinesetConversionInput) { _, _, warns, err := FromAWSMachineSetAndInfra(in.machineSetBuilder.Build(), in.infra).ToMachineSetAndMachineTemplate() - Expect(err).To(matchers.ConsistOfMatchErrorSubstrings(in.expectedErrors), "should match expected errors while converting an AWS MAPI MachineSet to CAPI") - Expect(warns).To(matchers.ConsistOfSubstrings(in.expectedWarnings), "should match expected warnings while converting an AWS MAPI MachineSet to CAPI") + Expect(err).To(matchers.ConsistOfMatchErrorSubstrings(in.expectedErrors), "should match expected errors while converting an AWS Machine API MachineSet to Cluster API") + Expect(warns).To(matchers.ConsistOfSubstrings(in.expectedWarnings), "should match expected warnings while converting an AWS Machine API MachineSet to Cluster API") }, Entry("With a Base configuration", awsMAPI2CAPIMachinesetConversionInput{ diff --git a/pkg/conversion/mapi2capi/machineset_test.go b/pkg/conversion/mapi2capi/machineset_test.go index 06dcb6f6e..019225fb6 100644 --- a/pkg/conversion/mapi2capi/machineset_test.go +++ b/pkg/conversion/mapi2capi/machineset_test.go @@ -49,9 +49,9 @@ var _ = Describe("mapi2capi MachineSet conversion", func() { in.infraBuilder.Build(), ).ToMachineSetAndMachineTemplate() Expect(err).To(matchers.ConsistOfMatchErrorSubstrings(in.expectedErrors), - "should match expected errors while converting MAPI MachineSet to CAPI MachineSet") + "should match expected errors while converting Machine API MachineSet to Cluster API MachineSet") Expect(warns).To(matchers.ConsistOfSubstrings(in.expectedWarnings), - "should match expected warnings while converting MAPI MachineSet to CAPI MachineSet") + "should match expected warnings while converting Machine API MachineSet to Cluster API MachineSet") }, // Base Case diff --git a/pkg/conversion/mapi2capi/powervs_test.go b/pkg/conversion/mapi2capi/powervs_test.go index 2a5daf59d..5957b7847 100644 --- a/pkg/conversion/mapi2capi/powervs_test.go +++ b/pkg/conversion/mapi2capi/powervs_test.go @@ -77,7 +77,7 @@ var _ = Describe("mapi2capi PowerVS conversion", func() { func(in powerVSMAPI2CAPIConversionInput) { _, _, _, err := FromPowerVSMachineAndInfra(in.machineBuilder.Build(), in.infra).ToMachineAndInfrastructureMachine() fmt.Println(err) - Expect(err).To(matchers.ConsistOfMatchErrorSubstrings(in.expectedErrors), "should match expected errors while converting an PowerVS MAPI Machine to CAPI") + Expect(err).To(matchers.ConsistOfMatchErrorSubstrings(in.expectedErrors), "should match expected errors while converting an PowerVS Machine API Machine to Cluster API") }, @@ -144,7 +144,7 @@ var _ = Describe("mapi2capi PowerVS conversion", func() { var _ = DescribeTable("mapi2capi PowerVS convert MAPI MachineSet", func(in powerVSMAPI2CAPIMachineSetConversionInput) { _, _, _, err := FromPowerVSMachineSetAndInfra(in.machineSetBuilder.Build(), in.infra).ToMachineSetAndMachineTemplate() - Expect(err).To(matchers.ConsistOfMatchErrorSubstrings(in.expectedErrors), "should match expected errors while converting an PowerVS MAPI MachineSet to CAPI") + Expect(err).To(matchers.ConsistOfMatchErrorSubstrings(in.expectedErrors), "should match expected errors while converting an PowerVS Machine API MachineSet to Cluster API") }, Entry("With a Base configuration", powerVSMAPI2CAPIMachineSetConversionInput{ diff --git a/pkg/util/watch_filters.go b/pkg/util/watch_filters.go index 149540cc8..dc8e74bee 100644 --- a/pkg/util/watch_filters.go +++ b/pkg/util/watch_filters.go @@ -71,7 +71,7 @@ func ResolveCAPIMachineSetFromObject(namespace string) func(context.Context, cli continue } - klog.V(4).Info("Object is owned by a CAPI machineset, enqueueing request", + klog.V(4).Info("Object is owned by a Cluster API machineset, enqueueing request", "machine", obj.GetName(), "machineset", ref.Name) requests = append(requests, reconcile.Request{