From 47e441e47819ea955e0ab6d29ab74a3756506767 Mon Sep 17 00:00:00 2001 From: Balazs Gibizer Date: Mon, 3 Apr 2023 15:07:36 +0200 Subject: [PATCH] Fix typos This PR is motivated by the fix https://github.com/openstack-k8s-operators/lib-common/pull/231 --- api/v1beta1/conditions.go | 16 +++++----- api/v1beta1/novaapi_types.go | 2 +- api/v1beta1/novacell_types.go | 10 +++---- api/v1beta1/novaconductor_types.go | 4 +-- api/v1beta1/novaexternalcompute_types.go | 2 +- api/v1beta1/novametadata_types.go | 4 +-- api/v1beta1/novascheduler_types.go | 4 +-- config/crd/bases/nova.openstack.org_nova.yaml | 4 +-- .../bases/nova.openstack.org_novaapis.yaml | 2 +- .../bases/nova.openstack.org_novacells.yaml | 6 ++-- .../nova.openstack.org_novaconductors.yaml | 4 +-- .../nova.openstack.org_novametadata.yaml | 4 +-- .../nova.openstack.org_novaschedulers.yaml | 4 +-- controllers/common.go | 22 +++++++------- controllers/nova_controller.go | 24 +++++++-------- controllers/novaapi_controller.go | 4 +-- controllers/novacell_controller.go | 2 +- controllers/novaconductor_controller.go | 2 +- controllers/novaexternalcompute_controller.go | 30 +++++++++---------- controllers/novametadata_controller.go | 2 +- controllers/novascheduler_controller.go | 2 +- pkg/novaapi/deployment.go | 2 +- pkg/novaconductor/dbsync.go | 2 +- pkg/novaconductor/deployment.go | 4 +-- pkg/novaconductor/initcontainer.go | 2 +- pkg/novametadata/deployment.go | 2 +- pkg/novascheduler/deployment.go | 2 +- test/functional/base_test.go | 4 +-- test/functional/nova_controller_test.go | 6 ++-- .../nova_metadata_controller_test.go | 16 +++++----- test/functional/nova_multicell_test.go | 4 +-- test/functional/nova_reconfiguration_test.go | 4 +-- test/functional/nova_scheduler_test.go | 12 ++++---- test/functional/novaapi_controller_test.go | 14 ++++----- test/functional/novacell_controller_test.go | 2 +- .../novaconductor_controller_test.go | 12 ++++---- .../novaexternalcompute_controller_test.go | 8 ++--- test/functional/sample_test.go | 4 +-- test/functional/suite_test.go | 2 +- 39 files changed, 128 insertions(+), 128 deletions(-) diff --git a/api/v1beta1/conditions.go b/api/v1beta1/conditions.go index 95ec4e5ea..2926f7f8b 100644 --- a/api/v1beta1/conditions.go +++ b/api/v1beta1/conditions.go @@ -53,13 +53,13 @@ const ( NovaAPIReadyInitMessage = "NovaAPI not started" // NovaAPIReadyErrorMessage - NovaAPIReadyErrorMessage = "NovaAPI error occured %s" + NovaAPIReadyErrorMessage = "NovaAPI error occurred %s" // NovaConductorReadyInitMessage NovaConductorReadyInitMessage = "NovaConductor not started" // NovaConductorReadyErrorMessage - NovaConductorReadyErrorMessage = "NovaConductor error occured %s" + NovaConductorReadyErrorMessage = "NovaConductor error occurred %s" // NovaAllCellsDBReadyInitMessage NovaAllCellsDBReadyInitMessage = "DB creation not started" @@ -71,7 +71,7 @@ const ( NovaAllCellsDBReadyErrorMessage = "DB creation failed for %s" // NovaAllCellsReadyMessage - NovaAllCellsDBReadyMessage = "All DBs created succcessfully" + NovaAllCellsDBReadyMessage = "All DBs created successfully" // NovaAllCellsReadyInitMessage NovaAllCellsReadyInitMessage = "NovaCells are not started" @@ -98,7 +98,7 @@ const ( NovaAPIMQReadyMessage = "API message bus creation successfully" // NovaAPIMQReadyCreatingMessage - NovaAPIMQReadyCreatingMessage = "API message bus creation onging" + NovaAPIMQReadyCreatingMessage = "API message bus creation ongoing" // NovaAllCellsMQReadyInitMessage NovaAllCellsMQReadyInitMessage = "Message bus creation not started" @@ -116,13 +116,13 @@ const ( NovaSchedulerReadyInitMessage = "NovaScheduler not started" // NovaSchedulerReadyErrorMessage - NovaSchedulerReadyErrorMessage = "NovaScheduler error occured %s" + NovaSchedulerReadyErrorMessage = "NovaScheduler error occurred %s" // InputReadyWaitingMessage InputReadyWaitingMessage = "Input data resources missing: %s" // NovaCellReadyInitMessage - NovaCellReadyInitMessage = "The status of NovaCell %s is unkown" + NovaCellReadyInitMessage = "The status of NovaCell %s is unknown" // NovaCellReadyNotExistsMessage NovaCellReadyNotExistsMessage = "Waiting for NovaCell %s to exists" @@ -131,7 +131,7 @@ const ( NovaCellReadyNotReadyMessage = "Waiting for NovaCell %s to become Ready" //NovaCellReadyErrorMessage - NovaCellReadyErrorMessage = "Error occured while querying NovaCell %s: %s" + NovaCellReadyErrorMessage = "Error occurred while querying NovaCell %s: %s" //NovaCellReadyMessage NovaCellReadyMessage = "NovaCell %s is Ready" @@ -140,5 +140,5 @@ const ( NovaMetadataReadyInitMessage = "NovaMetadata not started" //NovaMetadataReadyInitMessage - NovaMetadataReadyErrorMessage = "NovaMetadata error occured %s" + NovaMetadataReadyErrorMessage = "NovaMetadata error occurred %s" ) diff --git a/api/v1beta1/novaapi_types.go b/api/v1beta1/novaapi_types.go index 82094533f..59d35533f 100644 --- a/api/v1beta1/novaapi_types.go +++ b/api/v1beta1/novaapi_types.go @@ -80,7 +80,7 @@ type NovaAPISpec struct { // +kubebuilder:validation:Required // Secret is the name of the Secret instance containing password - // information for the nova-api sevice. + // information for the nova-api service. Secret string `json:"secret"` // +kubebuilder:validation:Optional diff --git a/api/v1beta1/novacell_types.go b/api/v1beta1/novacell_types.go index 4388d9bfe..86c3a3959 100644 --- a/api/v1beta1/novacell_types.go +++ b/api/v1beta1/novacell_types.go @@ -56,11 +56,11 @@ type NovaCellTemplate struct { ConductorServiceTemplate NovaConductorTemplate `json:"conductorServiceTemplate"` // +kubebuilder:validation:Optional - // MetadataServiceTemplate - defines the metadata serive dedicated for the cell. + // MetadataServiceTemplate - defines the metadata service dedicated for the cell. MetadataServiceTemplate NovaMetadataTemplate `json:"metadataServiceTemplate"` // +kubebuilder:validation:Optional - // NoVNCProxyServiceTemplate - defines the novvncproxy serive dedicated for + // NoVNCProxyServiceTemplate - defines the novvncproxy service dedicated for // the cell. NoVNCProxyServiceTemplate NovaNoVNCProxyTemplate `json:"noVNCProxyServiceTemplate"` } @@ -106,7 +106,7 @@ type NovaCellSpec struct { // +kubebuilder:validation:Optional // APIDatabaseHostname - hostname to use when accessing the API DB. If not - // provided then upcalls will be disabled. This filed is Required for + // provided then up-calls will be disabled. This filed is Required for // cell0. // TODO(gibi): Add a webhook to validate cell0 constraint APIDatabaseHostname string `json:"apiDatabaseHostname"` @@ -121,7 +121,7 @@ type NovaCellSpec struct { CellDatabaseHostname string `json:"cellDatabaseHostname"` // +kubebuilder:validation:Required - // CellMessageBusSecretName - the name of the Secret conntaining the + // CellMessageBusSecretName - the name of the Secret containing the // transport URL information to use when accessing the Cell message // bus. For cell0 this should be the Secret for the API message bus. CellMessageBusSecretName string `json:"cellMessageBusSecretName"` @@ -137,7 +137,7 @@ type NovaCellSpec struct { ConductorServiceTemplate NovaConductorTemplate `json:"conductorServiceTemplate"` // +kubebuilder:validation:Optional - // MetadataServiceTemplate - defines the metadata serive dedicated for the cell. + // MetadataServiceTemplate - defines the metadata service dedicated for the cell. MetadataServiceTemplate NovaMetadataTemplate `json:"metadataServiceTemplate"` // +kubebuilder:validation:Required diff --git a/api/v1beta1/novaconductor_types.go b/api/v1beta1/novaconductor_types.go index c8d6adbd2..07bc8863c 100644 --- a/api/v1beta1/novaconductor_types.go +++ b/api/v1beta1/novaconductor_types.go @@ -103,7 +103,7 @@ type NovaConductorSpec struct { // +kubebuilder:validation:Optional // APIDatabaseHostname - hostname to use when accessing the API DB. If not - // provided then upcalls will be disabled. This filed is Required for + // provided then up-calls will be disabled. This filed is Required for // cell0. // TODO(gibi): Add a webhook to validate cell0 constraint APIDatabaseHostname string `json:"apiDatabaseHostname"` @@ -119,7 +119,7 @@ type NovaConductorSpec struct { CellDatabaseHostname string `json:"cellDatabaseHostname"` // +kubebuilder:validation:Required - // CellMessageBusSecretName - the name of the Secret conntaining the + // CellMessageBusSecretName - the name of the Secret containing the // transport URL information to use when accessing the Cell message // bus. CellMessageBusSecretName string `json:"cellMessageBusSecretName"` diff --git a/api/v1beta1/novaexternalcompute_types.go b/api/v1beta1/novaexternalcompute_types.go index 96f92172e..f494f6dc5 100644 --- a/api/v1beta1/novaexternalcompute_types.go +++ b/api/v1beta1/novaexternalcompute_types.go @@ -98,7 +98,7 @@ type NovaExternalComputeStatus struct { // NOTE(gibi): If nova-operator ever needs RPM packages to be installed to // the host then we need to communicate in the Status to the - // dataplane-operator probably as a list of pacakge names and a list of + // dataplane-operator probably as a list of package names and a list of // package repositories. } diff --git a/api/v1beta1/novametadata_types.go b/api/v1beta1/novametadata_types.go index 0fe865784..43d482341 100644 --- a/api/v1beta1/novametadata_types.go +++ b/api/v1beta1/novametadata_types.go @@ -127,7 +127,7 @@ type NovaMetadataSpec struct { CellDatabaseHostname string `json:"cellDatabaseHostname"` // +kubebuilder:validation:Optional - // APIMessageBusSecretName - the name of the Secret conntaining the + // APIMessageBusSecretName - the name of the Secret containing the // transport URL information to use when accessing the API message // bus. // TODO(ksambor): add a validation webhook to enforce that it is required @@ -135,7 +135,7 @@ type NovaMetadataSpec struct { APIMessageBusSecretName string `json:"apiMessageBusSecretName"` // +kubebuilder:validation:Optional - // CellMessageBusSecretName - the name of the Secret conntaining the + // CellMessageBusSecretName - the name of the Secret containing the // transport URL information to use when accessing the Cell message // bus. CellMessageBusSecretName string `json:"cellMessageBusSecretName"` diff --git a/api/v1beta1/novascheduler_types.go b/api/v1beta1/novascheduler_types.go index bba6326ff..ee73793f6 100644 --- a/api/v1beta1/novascheduler_types.go +++ b/api/v1beta1/novascheduler_types.go @@ -72,7 +72,7 @@ type NovaSchedulerSpec struct { // +kubebuilder:validation:Required // Secret is the name of the Secret instance containing password - // information for the nova-scheduler sevice. + // information for the nova-scheduler service. Secret string `json:"secret"` // +kubebuilder:validation:Optional @@ -102,7 +102,7 @@ type NovaSchedulerSpec struct { APIDatabaseHostname string `json:"apiDatabaseHostname"` // +kubebuilder:validation:Required - // APIMessageBusSecretName - the name of the Secret conntaining the + // APIMessageBusSecretName - the name of the Secret containing the // transport URL information to use when accessing the API message // bus. APIMessageBusSecretName string `json:"apiMessageBusSecretName"` diff --git a/config/crd/bases/nova.openstack.org_nova.yaml b/config/crd/bases/nova.openstack.org_nova.yaml index 75d287d7f..28d5fcd80 100644 --- a/config/crd/bases/nova.openstack.org_nova.yaml +++ b/config/crd/bases/nova.openstack.org_nova.yaml @@ -312,7 +312,7 @@ spec: type: boolean metadataServiceTemplate: description: MetadataServiceTemplate - defines the metadata - serive dedicated for the cell. + service dedicated for the cell. properties: containerImage: default: quay.io/tripleozedcentos9/openstack-nova-api:current-tripleo @@ -449,7 +449,7 @@ spec: type: object noVNCProxyServiceTemplate: description: NoVNCProxyServiceTemplate - defines the novvncproxy - serive dedicated for the cell. + service dedicated for the cell. properties: containerImage: default: quay.io/tripleozedcentos9/openstack-nova-novncproxy:current-tripleo diff --git a/config/crd/bases/nova.openstack.org_novaapis.yaml b/config/crd/bases/nova.openstack.org_novaapis.yaml index b04228916..8bc5727d2 100644 --- a/config/crd/bases/nova.openstack.org_novaapis.yaml +++ b/config/crd/bases/nova.openstack.org_novaapis.yaml @@ -251,7 +251,7 @@ spec: type: object secret: description: Secret is the name of the Secret instance containing - password information for the nova-api sevice. + password information for the nova-api service. type: string serviceUser: default: nova diff --git a/config/crd/bases/nova.openstack.org_novacells.yaml b/config/crd/bases/nova.openstack.org_novacells.yaml index 6db0a05ff..b3713f109 100644 --- a/config/crd/bases/nova.openstack.org_novacells.yaml +++ b/config/crd/bases/nova.openstack.org_novacells.yaml @@ -37,7 +37,7 @@ spec: properties: apiDatabaseHostname: description: 'APIDatabaseHostname - hostname to use when accessing - the API DB. If not provided then upcalls will be disabled. This + the API DB. If not provided then up-calls will be disabled. This filed is Required for cell0. TODO(gibi): Add a webhook to validate cell0 constraint' type: string @@ -56,7 +56,7 @@ spec: cell DB type: string cellMessageBusSecretName: - description: CellMessageBusSecretName - the name of the Secret conntaining + description: CellMessageBusSecretName - the name of the Secret containing the transport URL information to use when accessing the Cell message bus. For cell0 this should be the Secret for the API message bus. type: string @@ -190,7 +190,7 @@ spec: can use to talk to keystone type: string metadataServiceTemplate: - description: MetadataServiceTemplate - defines the metadata serive + description: MetadataServiceTemplate - defines the metadata service dedicated for the cell. properties: containerImage: diff --git a/config/crd/bases/nova.openstack.org_novaconductors.yaml b/config/crd/bases/nova.openstack.org_novaconductors.yaml index 336183cc9..06fac319e 100644 --- a/config/crd/bases/nova.openstack.org_novaconductors.yaml +++ b/config/crd/bases/nova.openstack.org_novaconductors.yaml @@ -50,7 +50,7 @@ spec: properties: apiDatabaseHostname: description: 'APIDatabaseHostname - hostname to use when accessing - the API DB. If not provided then upcalls will be disabled. This + the API DB. If not provided then up-calls will be disabled. This filed is Required for cell0. TODO(gibi): Add a webhook to validate cell0 constraint' type: string @@ -69,7 +69,7 @@ spec: cell DB type: string cellMessageBusSecretName: - description: CellMessageBusSecretName - the name of the Secret conntaining + description: CellMessageBusSecretName - the name of the Secret containing the transport URL information to use when accessing the Cell message bus. type: string diff --git a/config/crd/bases/nova.openstack.org_novametadata.yaml b/config/crd/bases/nova.openstack.org_novametadata.yaml index 6fdb2e178..2640d76c7 100644 --- a/config/crd/bases/nova.openstack.org_novametadata.yaml +++ b/config/crd/bases/nova.openstack.org_novametadata.yaml @@ -59,7 +59,7 @@ spec: API DB type: string apiMessageBusSecretName: - description: 'APIMessageBusSecretName - the name of the Secret conntaining + description: 'APIMessageBusSecretName - the name of the Secret containing the transport URL information to use when accessing the API message bus. TODO(ksambor): add a validation webhook to enforce that it is required for the CellName == ""' @@ -76,7 +76,7 @@ spec: cell DB type: string cellMessageBusSecretName: - description: CellMessageBusSecretName - the name of the Secret conntaining + description: CellMessageBusSecretName - the name of the Secret containing the transport URL information to use when accessing the Cell message bus. type: string diff --git a/config/crd/bases/nova.openstack.org_novaschedulers.yaml b/config/crd/bases/nova.openstack.org_novaschedulers.yaml index e2b6fb9bd..b6de75fb6 100644 --- a/config/crd/bases/nova.openstack.org_novaschedulers.yaml +++ b/config/crd/bases/nova.openstack.org_novaschedulers.yaml @@ -58,7 +58,7 @@ spec: API DB type: string apiMessageBusSecretName: - description: APIMessageBusSecretName - the name of the Secret conntaining + description: APIMessageBusSecretName - the name of the Secret containing the transport URL information to use when accessing the API message bus. type: string @@ -211,7 +211,7 @@ spec: type: object secret: description: Secret is the name of the Secret instance containing - password information for the nova-scheduler sevice. + password information for the nova-scheduler service. type: string serviceUser: default: nova diff --git a/controllers/common.go b/controllers/common.go index 6176e6ac8..d0432fe48 100644 --- a/controllers/common.go +++ b/controllers/common.go @@ -42,13 +42,13 @@ import ( const ( // NovaAPILabelPrefix - a unique, service binary specific prefix for the - // labeles the NovaAPI controller uses on children objects + // labels the NovaAPI controller uses on children objects NovaAPILabelPrefix = "nova-api" // NovaConductorLabelPrefix - a unique, service binary specific prefix for - // the labeles the NovaConductor controller uses on children objects + // the labels the NovaConductor controller uses on children objects NovaConductorLabelPrefix = "nova-conductor" // NovaSchedulerLabelPrefix - a unique, service binary specific prefix for - // the labeles the NovaScheduler controller uses on children objects + // the labels the NovaScheduler controller uses on children objects NovaSchedulerLabelPrefix = "nova-scheduler" // NovaExternalComputeLabelPrefix - a unique, prefix used for the AEE CR // and other children objects created to mange external computes @@ -57,7 +57,7 @@ const ( // the nova operator NovaLabelPrefix = "nova" // NovaMetadataLabelPrefix - a unique, service binary specific prefix for - // the labeles the NovaMetadata controller uses on children objects + // the labels the NovaMetadata controller uses on children objects NovaMetadataLabelPrefix = "nova-metadata" // DbSyncHash - the field name in Status.Hashes storing the has of the DB // sync job @@ -264,7 +264,7 @@ func ensureConfigMap( return hash, ctrl.Result{}, nil } -// hashOfInputHashes - calculates the overal hash of all our inputs +// hashOfInputHashes - calculates the overall hash of all our inputs func hashOfInputHashes( ctx context.Context, hashes map[string]env.Setter, @@ -286,14 +286,14 @@ type ReconcilerBase struct { RequeueTimeout time.Duration } -// Managable all types that conform to this interface can be setup with a controller-runtime manager. -type Managable interface { +// Manageable all types that conform to this interface can be setup with a controller-runtime manager. +type Manageable interface { SetupWithManager(mgr ctrl.Manager) error } // Reconciler represents a generic interface for all Reconciler objects in nova type Reconciler interface { - Managable + Manageable SetRequeueTimeout(timeout time.Duration) } @@ -317,7 +317,7 @@ func (r *ReconcilerBase) SetRequeueTimeout(timeout time.Duration) { } // Reconcilers holds all the Reconciler objects of the nova-operator to -// allow generic managemenet of them. +// allow generic management of them. type Reconcilers struct { reconcilers map[string]Reconciler } @@ -365,8 +365,8 @@ func (r *Reconcilers) Setup(mgr ctrl.Manager, setupLog logr.Logger) error { return nil } -// OverriedRequeueTimeout overrides the default RequeueTimeout of our reconcilers -func (r *Reconcilers) OverriedRequeueTimeout(timeout time.Duration) { +// OverrideRequeueTimeout overrides the default RequeueTimeout of our reconcilers +func (r *Reconcilers) OverrideRequeueTimeout(timeout time.Duration) { for _, reconciler := range r.reconcilers { reconciler.SetRequeueTimeout(timeout) } diff --git a/controllers/nova_controller.go b/controllers/nova_controller.go index 87bf8d1d6..a5617f512 100644 --- a/controllers/nova_controller.go +++ b/controllers/nova_controller.go @@ -105,7 +105,7 @@ func (r *NovaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul } // Always update the instance status when exiting this function so we can - // persist any changes happend during the current reconciliation. + // persist any changes happened during the current reconciliation. defer func() { // update the Ready condition based on the sub conditions if allSubConditionIsTrue(instance.Status) { @@ -137,7 +137,7 @@ func (r *NovaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul updated := controllerutil.AddFinalizer(instance, h.GetFinalizer()) if updated { util.LogForObject(h, "Added finalizer to ourselves", instance) - // we intentionally return imediately to force the deferred function + // we intentionally return immediately to force the deferred function // to persist the Instance with the finalizer. We need to have our own // finalizer persisted before we try to create the KeystoneService with // our finalizer to avoid orphaning the KeystoneService. @@ -169,10 +169,10 @@ func (r *NovaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul // We create the API DB separately from the Cell DBs as we want to report // its status separately and we need to pass the API DB around for Cells - // having upcall support + // having up-call support // NOTE(gibi): We don't return on error or if the DB is not ready yet. We // move forward and kick off the rest of the work we can do (e.g. creating - // Cell DBs and Cells without upcall support). Eventually we rely on the + // Cell DBs and Cells without up-call support). Eventually we rely on the // watch to get reconciled if the status of the API DB resource changes. apiDB, apiDBStatus, apiDBError := r.ensureAPIDB(ctx, h, instance) switch apiDBStatus { @@ -208,7 +208,7 @@ func (r *NovaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul } // Create the Cell DBs. Note that we are not returning on error or if the - // DB creation is still in progress. We move forward with whathever we can + // DB creation is still in progress. We move forward with whatever we can // and relay on the watch to get reconciled if some of the resources change // status cellDBs := map[string]*nova.Database{} @@ -354,7 +354,7 @@ func (r *NovaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul } // The cell0 is always handled first in the loop as we iterate on - // orderdCellNames. So for any other cells we can get cell0 from cells + // orderedCellNames. So for any other cells we can get cell0 from cells // as it is already there. if cellName != Cell0Name && cellTemplate.HasAPIAccess && !cells[Cell0Name].IsReady() { allCellsReady = false @@ -667,7 +667,7 @@ func (r *NovaReconciler) ensureCell( } op, err := controllerutil.CreateOrPatch(ctx, r.Client, cell, func() error { - // TODO(gibi): Pass down a narroved secret that only hold + // TODO(gibi): Pass down a narrowed secret that only hold // specific information but also holds user names cell.Spec = cellSpec @@ -700,7 +700,7 @@ func (r *NovaReconciler) ensureAPI( apiMQSecretName string, keystoneAuthURL string, ) (ctrl.Result, error) { - // TODO(gibi): Pass down a narroved secret that only hold + // TODO(gibi): Pass down a narrowed secret that only hold // specific information but also holds user names apiSpec := novav1.NovaAPISpec{ Secret: instance.Spec.Secret, @@ -778,7 +778,7 @@ func (r *NovaReconciler) ensureScheduler( apiMQSecretName string, keystoneAuthURL string, ) (ctrl.Result, error) { - // TODO(gibi): Pass down a narroved secret that only hold + // TODO(gibi): Pass down a narrowed secret that only hold // specific information but also holds user names spec := novav1.NovaSchedulerSpec{ Secret: instance.Spec.Secret, @@ -954,7 +954,7 @@ func (r *NovaReconciler) getKeystoneAuthURL( if err != nil { return "", err } - // NOTE(gibi): we use the internal enpoint as that is expected to be + // NOTE(gibi): we use the internal endpoint as that is expected to be // available on the external compute nodes as well and we want to keep // thing consistent authURL, err := keystoneAPI.GetEndpoint(endpoint.EndpointInternal) @@ -981,7 +981,7 @@ func (r *NovaReconciler) reconcileDelete( return err } - // Successfully cleaned up everyting. So as the final step let's remove the + // Successfully cleaned up everything. So as the final step let's remove the // finalizer from ourselves to allow the deletion of Nova CR itself updated := controllerutil.RemoveFinalizer(instance, h.GetFinalizer()) if updated { @@ -1053,7 +1053,7 @@ func (r *NovaReconciler) ensureMetadata( keystoneAuthURL string, ) (ctrl.Result, error) { - // TODO(gibi): Pass down a narroved secret that only hold + // TODO(gibi): Pass down a narrowed secret that only hold // specific information but also holds user names apiSpec := novav1.NovaMetadataSpec{ Secret: instance.Spec.Secret, diff --git a/controllers/novaapi_controller.go b/controllers/novaapi_controller.go index c6eaef22f..dca562c65 100644 --- a/controllers/novaapi_controller.go +++ b/controllers/novaapi_controller.go @@ -111,7 +111,7 @@ func (r *NovaAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re } // Always update the instance status when exiting this function so we can - // persist any changes happend during the current reconciliation. + // persist any changes happened during the current reconciliation. defer func() { // update the Ready condition based on the sub conditions if allSubConditionIsTrue(instance.Status) { @@ -589,7 +589,7 @@ func (r *NovaAPIReconciler) reconcileDelete( return err } - // Successfully cleaned up everyting. So as the final step let's remove the + // Successfully cleaned up everything. So as the final step let's remove the // finalizer from ourselves to allow the deletion of NovaAPI CR itself updated := controllerutil.RemoveFinalizer(instance, h.GetFinalizer()) if updated { diff --git a/controllers/novacell_controller.go b/controllers/novacell_controller.go index 28085ec6e..07a0a024d 100644 --- a/controllers/novacell_controller.go +++ b/controllers/novacell_controller.go @@ -89,7 +89,7 @@ func (r *NovaCellReconciler) Reconcile(ctx context.Context, req ctrl.Request) (r } // Always update the instance status when exiting this function so we can - // persist any changes happend during the current reconciliation. + // persist any changes happened during the current reconciliation. defer func() { // update the Ready condition based on the sub conditions if allSubConditionIsTrue(instance.Status) { diff --git a/controllers/novaconductor_controller.go b/controllers/novaconductor_controller.go index 224deac3b..5eb0a888d 100644 --- a/controllers/novaconductor_controller.go +++ b/controllers/novaconductor_controller.go @@ -103,7 +103,7 @@ func (r *NovaConductorReconciler) Reconcile(ctx context.Context, req ctrl.Reques } // Always update the instance status when exiting this function so we can - // persist any changes happend during the current reconciliation. + // persist any changes happened during the current reconciliation. defer func() { // update the Ready condition based on the sub conditions if allSubConditionIsTrue(instance.Status) { diff --git a/controllers/novaexternalcompute_controller.go b/controllers/novaexternalcompute_controller.go index c38c64e69..59cd336a3 100644 --- a/controllers/novaexternalcompute_controller.go +++ b/controllers/novaexternalcompute_controller.go @@ -97,7 +97,7 @@ func (r *NovaExternalComputeReconciler) Reconcile(ctx context.Context, req ctrl. } // Always update the instance status when exiting this function so we can - // persist any changes happend during the current reconciliation. + // persist any changes happened during the current reconciliation. defer func() { // update the overall status condition if service is ready if allSubConditionIsTrue(instance.Status) { @@ -129,7 +129,7 @@ func (r *NovaExternalComputeReconciler) Reconcile(ctx context.Context, req ctrl. updated := controllerutil.AddFinalizer(instance, h.GetFinalizer()) if updated { l.Info("Added finalizer to ourselves") - // we intentionally return imediately to force the deferred function + // we intentionally return immediately to force the deferred function // to persist the Instance with the finalizer. We need to have our own // finalizer persisted before we deploy any compute to avoid orphaning // the compute rows in our database during CR deletion. @@ -207,7 +207,7 @@ func (r *NovaExternalComputeReconciler) Reconcile(ctx context.Context, req ctrl. // we support stopping before deploying the compute node // so only create the AAE CRs if we have deployment enabled. if instance.Spec.Deploy { - // create all AEE resouce in parallel + // create all AEE resource in parallel libvirtAEE, err := r.ensureAEEDeployLibvirt(ctx, h, instance) if err != nil { return ctrl.Result{}, err @@ -217,7 +217,7 @@ func (r *NovaExternalComputeReconciler) Reconcile(ctx context.Context, req ctrl. return ctrl.Result{}, err } - // then check if they have compelted and requeue if not. + // then check if they have completed and requeue if not. if libvirtAEE.Status.JobStatus != "Succeeded" { return ctrl.Result{RequeueAfter: r.RequeueTimeout}, fmt.Errorf( "libvirt deployment %s for %s", libvirtAEE.Status.JobStatus, instance.Name, @@ -229,7 +229,7 @@ func (r *NovaExternalComputeReconciler) Reconcile(ctx context.Context, req ctrl. ) } - // we only get here if we completed succesffuly so we can just delete them + // we only get here if we completed successfully so we can just delete them err = r.cleanupAEE(ctx, h, libvirtAEE) if err != nil { return ctrl.Result{}, err @@ -239,7 +239,7 @@ func (r *NovaExternalComputeReconciler) Reconcile(ctx context.Context, req ctrl. return ctrl.Result{}, err } // only mark true if we have completed all steps - // this should be at the end of the function to ensure we dont set the status + // this should be at the end of the function to ensure we don't set the status // if we can fail later in the function. instance.Status.Conditions.MarkTrue( condition.DeploymentReadyCondition, condition.DeploymentReadyMessage, @@ -308,10 +308,10 @@ func (r *NovaExternalComputeReconciler) reconcileDelete( l.Info("Reconciling delete") // TODO(gibi): A compute is being removed from the system so we might want - // to clean up the compure Service and the ComputeNode from the cell + // to clean up the compute Service and the ComputeNode from the cell // database - // Successfully cleaned up everyting. So as the final step let's remove the + // Successfully cleaned up everything. So as the final step let's remove the // finalizer from ourselves to allow the deletion of the CR itself updated := controllerutil.RemoveFinalizer(instance, h.GetFinalizer()) if updated { @@ -460,7 +460,7 @@ func (r *NovaExternalComputeReconciler) generateConfigs( "log_file": "/var/log/containers/nova/nova-compute.log", } extraData := map[string]string{} - // always generate this file even if empty to simplfy copying it + // always generate this file even if empty to simplify copying it // to the external compute. extraData["02-nova-override.conf"] = "" if instance.Spec.CustomServiceConfig != "" { @@ -517,7 +517,7 @@ func (r *NovaExternalComputeReconciler) ensurePlaybooks( util.LogForObject( h, "using playbooks for instance ", instance, "from ", playbookPath, ) - playbookDirEnteries, err := os.ReadDir(playbookPath) + playbookDirEntries, err := os.ReadDir(playbookPath) if err != nil { return err } @@ -533,7 +533,7 @@ func (r *NovaExternalComputeReconciler) ensurePlaybooks( } _, err = controllerutil.CreateOrPatch(ctx, h.GetClient(), configMap, func() error { - // FIXME: This is wrong we shoudl not be makeing the nova instnace CR own this. + // FIXME: This is wrong we should not be making the nova instance CR own this. // it should be owned by the operator... for now im just going to make sure // it exits and leak it it on operator removal. // novaInstance := &novav1.Nova{} @@ -556,7 +556,7 @@ func (r *NovaExternalComputeReconciler) ensurePlaybooks( // if err != nil { // return err // } - for _, entry := range playbookDirEnteries { + for _, entry := range playbookDirEntries { filename := entry.Name() filePath := path.Join(playbookPath, filename) data, err := os.ReadFile(filePath) @@ -667,7 +667,7 @@ func initAEE( playbook string, ) { ansibleEE.Spec.Image = instance.Spec.AnsibleEEContainerImage - // TODO we dont currently have this on the NovaExternalComputeCR + // TODO we don't currently have this on the NovaExternalComputeCR // ansibleEE.Spec.NetworkAttachments = instance.Spec.NetworkAttachments ansibleEE.Spec.Playbook = playbook ansibleEE.Spec.Env = []corev1.EnvVar{ @@ -676,7 +676,7 @@ func initAEE( {Name: "ANSIBLE_ENABLE_TASK_DEBUGGER", Value: "True"}, {Name: "ANSIBLE_VERBOSITY", Value: "1"}, } - // allocate tempory storage for the extra volume mounts to avoid + // allocate temporary storage for the extra volume mounts to avoid // pointer indirection via ansibleEE.Spec.ExtraMounts ansibleEEMounts := storage.VolMounts{} @@ -767,7 +767,7 @@ func initAEE( } ansibleEEMounts.Mounts = append(ansibleEEMounts.Mounts, serviceConfigMount) - // initalise ansibleEE.Spec.ExtraMounts from local ansibleEEMounts + // initialize ansibleEE.Spec.ExtraMounts from local ansibleEEMounts ansibleEE.Spec.ExtraMounts = []storage.VolMounts{ansibleEEMounts} } diff --git a/controllers/novametadata_controller.go b/controllers/novametadata_controller.go index 13de78c22..0ef2c5a79 100644 --- a/controllers/novametadata_controller.go +++ b/controllers/novametadata_controller.go @@ -106,7 +106,7 @@ func (r *NovaMetadataReconciler) Reconcile(ctx context.Context, req ctrl.Request } // Always update the instance status when exiting this function so we can - // persist any changes happend during the current reconciliation. + // persist any changes happened during the current reconciliation. defer func() { // update the Ready condition based on the sub conditions if allSubConditionIsTrue(instance.Status) { diff --git a/controllers/novascheduler_controller.go b/controllers/novascheduler_controller.go index 06199ab44..2106eda4f 100644 --- a/controllers/novascheduler_controller.go +++ b/controllers/novascheduler_controller.go @@ -102,7 +102,7 @@ func (r *NovaSchedulerReconciler) Reconcile(ctx context.Context, req ctrl.Reques } // Always update the instance status when exiting this function so we can - // persist any changes happend during the current reconciliation. + // persist any changes happened during the current reconciliation. defer func() { // update the Ready condition based on the sub conditions if allSubConditionIsTrue(instance.Status) { diff --git a/pkg/novaapi/deployment.go b/pkg/novaapi/deployment.go index 4ea8cfef9..927b36dca 100644 --- a/pkg/novaapi/deployment.go +++ b/pkg/novaapi/deployment.go @@ -44,7 +44,7 @@ func StatefulSet( FailureThreshold: 6, PeriodSeconds: 10, } - // After the first successful startupProbe, livenesProbe takes over + // After the first successful startupProbe, livenessProbe takes over livenessProbe := &corev1.Probe{ // TODO might need tuning TimeoutSeconds: 10, diff --git a/pkg/novaconductor/dbsync.go b/pkg/novaconductor/dbsync.go index aa15b1e3b..f0b8c6ea0 100644 --- a/pkg/novaconductor/dbsync.go +++ b/pkg/novaconductor/dbsync.go @@ -51,7 +51,7 @@ func CellDBSyncJob( CellDatabasePasswordSelector: "NovaCell0DatabasePassword", KeystoneServiceUserPasswordSelector: instance.Spec.PasswordSelectors.Service, // NOTE(gibi): these might be empty if the conductor does not support - // upcalls but that is OK + // up-calls but that is OK APIDatabaseHostname: instance.Spec.APIDatabaseHostname, APIDatabaseUser: instance.Spec.APIDatabaseUser, APIDatabaseName: nova.NovaAPIDatabaseName, diff --git a/pkg/novaconductor/deployment.go b/pkg/novaconductor/deployment.go index 455e8592c..4942348da 100644 --- a/pkg/novaconductor/deployment.go +++ b/pkg/novaconductor/deployment.go @@ -48,7 +48,7 @@ func StatefulSet( CellDatabasePasswordSelector: "NovaCell0DatabasePassword", KeystoneServiceUserPasswordSelector: instance.Spec.PasswordSelectors.Service, // NOTE(gibi): these might be empty if the conductor does not support - // upcalls but that is OK + // up-calls but that is OK APIDatabaseHostname: instance.Spec.APIDatabaseHostname, APIDatabaseUser: instance.Spec.APIDatabaseUser, APIDatabaseName: nova.NovaAPIDatabaseName, @@ -87,7 +87,7 @@ func StatefulSet( } } else { args = append(args, nova.KollaServiceCommand) - // TODO(gibi): replace this with a proper healthcheck once + // TODO(gibi): replace this with a proper health check once // https://review.opendev.org/q/topic:per-process-healthchecks merges. // NOTE(gibi): -r DRST means we consider nova-conductor processes // healthy if they are not in zombie state. diff --git a/pkg/novaconductor/initcontainer.go b/pkg/novaconductor/initcontainer.go index 41a1181d2..ce6a16d3c 100644 --- a/pkg/novaconductor/initcontainer.go +++ b/pkg/novaconductor/initcontainer.go @@ -94,7 +94,7 @@ func initContainer(init ContainerInput) []corev1.Container { }, } - // These are optional depending on if the conductor supports upcall + // These are optional depending on if the conductor supports up-call // or not if init.APIDatabaseHostname != "" { envVars["APIDatabaseHost"] = env.SetValue(init.APIDatabaseHostname) diff --git a/pkg/novametadata/deployment.go b/pkg/novametadata/deployment.go index 453908bc9..d6226a869 100644 --- a/pkg/novametadata/deployment.go +++ b/pkg/novametadata/deployment.go @@ -44,7 +44,7 @@ func StatefulSet( FailureThreshold: 6, PeriodSeconds: 10, } - // After the first successful startupProbe, livenesProbe takes over + // After the first successful startupProbe, livenessProbe takes over livenessProbe := &corev1.Probe{ // TODO might need tuning TimeoutSeconds: 10, diff --git a/pkg/novascheduler/deployment.go b/pkg/novascheduler/deployment.go index 4c42edcd0..f17e9c6dd 100644 --- a/pkg/novascheduler/deployment.go +++ b/pkg/novascheduler/deployment.go @@ -43,7 +43,7 @@ func StatefulSet( FailureThreshold: 6, PeriodSeconds: 10, } - // After the first successful startupProbe, livenesProbe takes over + // After the first successful startupProbe, livenessProbe takes over livenessProbe := &corev1.Probe{ // TODO might need tuning TimeoutSeconds: 10, diff --git a/test/functional/base_test.go b/test/functional/base_test.go index cd1003641..c908e1981 100644 --- a/test/functional/base_test.go +++ b/test/functional/base_test.go @@ -45,7 +45,7 @@ const ( // have maximum 100 retries before the timeout hits interval = timeout / 100 // consistencyTimeout is the amount of time we use to repeatedly check - // that a condition is still valid. This is intendet to be used in + // that a condition is still valid. This is intended to be used in // asserts using `Consistently`. consistencyTimeout = timeout ) @@ -587,7 +587,7 @@ func GetAEE(name types.NamespacedName) *aee.OpenStackAnsibleEE { return instance } -func SimulateAEESucceded(name types.NamespacedName) { +func SimulateAEESucceeded(name types.NamespacedName) { Eventually(func(g Gomega) { ansibleEE := GetAEE(name) ansibleEE.Status.JobStatus = "Succeeded" diff --git a/test/functional/nova_controller_test.go b/test/functional/nova_controller_test.go index 7640be162..6fc638e8e 100644 --- a/test/functional/nova_controller_test.go +++ b/test/functional/nova_controller_test.go @@ -445,7 +445,7 @@ var _ = Describe("Nova controller", func() { }) - It("does not set the cell db sync ready condtion to true", func() { + It("does not set the cell db sync ready condition to true", func() { th.ExpectCondition( cell0ConductorName, ConditionGetterFunc(NovaConductorConditionGetter), @@ -454,7 +454,7 @@ var _ = Describe("Nova controller", func() { ) }) - It("does not set the cell0 ready condtion to ture", func() { + It("does not set the cell0 ready condition to true", func() { th.ExpectCondition( cell0Name, ConditionGetterFunc(NovaCellConditionGetter), @@ -463,7 +463,7 @@ var _ = Describe("Nova controller", func() { ) }) - It("does not set the all cell ready condtion", func() { + It("does not set the all cell ready condition", func() { th.ExpectCondition( novaName, ConditionGetterFunc(NovaConditionGetter), diff --git a/test/functional/nova_metadata_controller_test.go b/test/functional/nova_metadata_controller_test.go index 2c80db4d6..261ef6745 100644 --- a/test/functional/nova_metadata_controller_test.go +++ b/test/functional/nova_metadata_controller_test.go @@ -43,7 +43,7 @@ var _ = Describe("NovaMetadata controller", func() { k8sClient.Delete, ctx, CreateNovaMessageBusSecret(namespace, MessageBusSecretName)) }) - When("with standard spec without networkinterface", func() { + When("with standard spec without network interface", func() { BeforeEach(func() { spec := GetDefaultNovaMetadataSpec() spec["customServiceConfig"] = "foo=bar" @@ -64,7 +64,7 @@ var _ = Describe("NovaMetadata controller", func() { It("has empty Status fields", func() { instance := GetNovaMetadata(novaMetadataName) // NOTE(gibi): Hash has `omitempty` tags so while - // they are initialized to an empty map that value is omited from + // they are initialized to an empty map that value is omitted from // the output when sent to the client. So we see nils here. Expect(instance.Status.Hash).To(BeEmpty()) Expect(instance.Status.ReadyCount).To(Equal(int32(0))) @@ -79,7 +79,7 @@ var _ = Describe("NovaMetadata controller", func() { }) }) - When("an unrealated Secret is created the CR state does not change", func() { + When("an unrelated Secret is created the CR state does not change", func() { BeforeEach(func() { secret := &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ @@ -134,7 +134,7 @@ var _ = Describe("NovaMetadata controller", func() { ) }) - It("reports that the inputes are not ready", func() { + It("reports that the inputs are not ready", func() { th.ExpectCondition( novaMetadataName, ConditionGetterFunc(NovaMetadataConditionGetter), @@ -395,7 +395,7 @@ var _ = Describe("NovaMetadata controller", func() { HaveKeyWithValue("k8s.v1.cni.cncf.io/networks", string(expectedAnnotation)), ) - // We simulat that there is no IP associated with the internalapi + // We simulate that there is no IP associated with the internalapi // network attachment SimulateStatefulSetReplicaReadyWithPods( statefulSetName, @@ -412,7 +412,7 @@ var _ = Describe("NovaMetadata controller", func() { "not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]", ) }) - It("reports NetworkAttachmentsReady if the Pods got the proper annotiations", func() { + It("reports NetworkAttachmentsReady if the Pods got the proper annotations", func() { internalMetadataName := types.NamespacedName{Namespace: namespace, Name: "internalapi"} nad := CreateNetworkAttachmentDefinition(internalMetadataName) DeferCleanup(DeleteInstance, nad) @@ -476,7 +476,7 @@ var _ = Describe("NovaMetadata controller", func() { } th.SimulateStatefulSetReplicaReady(statefulSetName) - // As the internal enpoint is configured in ExternalEndpoints it does not + // As the internal endpoint is configured in ExternalEndpoints it does not // get a Route but a Service with MetalLB annotations instead service := GetService(types.NamespacedName{Namespace: namespace, Name: "nova-metadata-internal"}) Expect(service.Annotations).To( @@ -526,7 +526,7 @@ var _ = Describe("NovaMetadata controller", func() { ) }) - It("applys new NetworkAttachments configuration", func() { + It("applies new NetworkAttachments configuration", func() { Eventually(func(g Gomega) { novaMetadata := GetNovaMetadata(novaMetadataName) novaMetadata.Spec.NetworkAttachments = append(novaMetadata.Spec.NetworkAttachments, "internalapi") diff --git a/test/functional/nova_multicell_test.go b/test/functional/nova_multicell_test.go index ddca3c564..af7defc97 100644 --- a/test/functional/nova_multicell_test.go +++ b/test/functional/nova_multicell_test.go @@ -77,7 +77,7 @@ func NewCell(novaName types.NamespacedName, cell string) Cell { return c } -var _ = Describe("Nova multicell", func() { +var _ = Describe("Nova multi cell", func() { var novaName types.NamespacedName var mariaDBDatabaseNameForAPI types.NamespacedName var cell0 Cell @@ -475,7 +475,7 @@ var _ = Describe("Nova multicell", func() { corev1.ConditionTrue, ) }) - It("creates cell2 NovaCell even if everthing else fails", func() { + It("creates cell2 NovaCell even if everything else fails", func() { // Don't simulate any success for any other DBs MQs or Cells // just for cell2 th.SimulateMariaDBDatabaseCompleted(cell2.MariaDBDatabaseName) diff --git a/test/functional/nova_reconfiguration_test.go b/test/functional/nova_reconfiguration_test.go index 007ee68fb..6ff826219 100644 --- a/test/functional/nova_reconfiguration_test.go +++ b/test/functional/nova_reconfiguration_test.go @@ -226,8 +226,8 @@ var _ = Describe("Nova reconfiguration", func() { }, timeout, interval).Should(Succeed()) }) }) - When("networkAttachemnt is added to a conductor while the definition is missing", func() { - It("applys new NetworkAttachments configuration to that Conductor", func() { + When("networkAttachment is added to a conductor while the definition is missing", func() { + It("applies new NetworkAttachments configuration to that Conductor", func() { cell1Names := NewCell(novaName, "cell1") Eventually(func(g Gomega) { diff --git a/test/functional/nova_scheduler_test.go b/test/functional/nova_scheduler_test.go index d8220e3e3..75f0186dc 100644 --- a/test/functional/nova_scheduler_test.go +++ b/test/functional/nova_scheduler_test.go @@ -59,7 +59,7 @@ var _ = Describe("NovaScheduler controller", func() { It("has empty Status fields", func() { instance := GetNovaScheduler(novaSchedulerName) // NOTE(gibi): Hash and Endpoints have `omitempty` tags so while - // they are initialized to {} that value is omited from the output + // they are initialized to {} that value is omitted from the output // when sent to the client. So we see nils here. Expect(instance.Status.Hash).To(BeEmpty()) Expect(instance.Status.ReadyCount).To(Equal(int32(0))) @@ -76,7 +76,7 @@ var _ = Describe("NovaScheduler controller", func() { }) - When("an unrealated Secret is created the CR state does not change", func() { + When("an unrelated Secret is created the CR state does not change", func() { BeforeEach(func() { secret := &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ @@ -132,7 +132,7 @@ var _ = Describe("NovaScheduler controller", func() { ) }) - It("reports that the inputes are not ready", func() { + It("reports that the inputs are not ready", func() { th.ExpectCondition( novaSchedulerName, ConditionGetterFunc(NovaSchedulerConditionGetter), @@ -377,7 +377,7 @@ var _ = Describe("NovaScheduler controller", func() { HaveKeyWithValue("k8s.v1.cni.cncf.io/networks", string(expectedAnnotation)), ) - // We simulat that there is no IP associated with the internalapi + // We simulate that there is no IP associated with the internalapi // network attachment SimulateStatefulSetReplicaReadyWithPods( statefulSetName, @@ -394,7 +394,7 @@ var _ = Describe("NovaScheduler controller", func() { "not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]", ) }) - It("reports NetworkAttachmentsReady if the Pods got the proper annotiations", func() { + It("reports NetworkAttachmentsReady if the Pods got the proper annotations", func() { internalAPINADName := types.NamespacedName{Namespace: namespace, Name: "internalapi"} nad := CreateNetworkAttachmentDefinition(internalAPINADName) DeferCleanup(DeleteInstance, nad) @@ -460,7 +460,7 @@ var _ = Describe("NovaScheduler controller", func() { ) }) - It("applys new NetworkAttachments configuration", func() { + It("applies new NetworkAttachments configuration", func() { Eventually(func(g Gomega) { novaScheduler := GetNovaScheduler(novaSchedulerName) novaScheduler.Spec.NetworkAttachments = append(novaScheduler.Spec.NetworkAttachments, "internalapi") diff --git a/test/functional/novaapi_controller_test.go b/test/functional/novaapi_controller_test.go index 709be3ffa..9dd1689f8 100644 --- a/test/functional/novaapi_controller_test.go +++ b/test/functional/novaapi_controller_test.go @@ -58,7 +58,7 @@ var _ = Describe("NovaAPI controller", func() { It("has empty Status fields", func() { instance := GetNovaAPI(novaAPIName) // NOTE(gibi): Hash and Endpoints have `omitempty` tags so while - // they are initialized to {} that value is omited from the output + // they are initialized to {} that value is omitted from the output // when sent to the client. So we see nils here. Expect(instance.Status.Hash).To(BeEmpty()) Expect(instance.Status.APIEndpoints).To(BeEmpty()) @@ -77,7 +77,7 @@ var _ = Describe("NovaAPI controller", func() { ) }) - When("an unrealated Secret is created the CR state does not change", func() { + When("an unrelated Secret is created the CR state does not change", func() { BeforeEach(func() { secret := &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ @@ -134,7 +134,7 @@ var _ = Describe("NovaAPI controller", func() { ) }) - It("reports that the inputes are not ready", func() { + It("reports that the inputs are not ready", func() { th.ExpectCondition( novaAPIName, ConditionGetterFunc(NovaAPIConditionGetter), @@ -478,7 +478,7 @@ var _ = Describe("NovaAPI controller", func() { HaveKeyWithValue("k8s.v1.cni.cncf.io/networks", string(expectedAnnotation)), ) - // We simulat that there is no IP associated with the internalapi + // We simulate that there is no IP associated with the internalapi // network attachment SimulateStatefulSetReplicaReadyWithPods( statefulSetName, @@ -495,7 +495,7 @@ var _ = Describe("NovaAPI controller", func() { "not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]", ) }) - It("reports NetworkAttachmentsReady if the Pods got the proper annotiations", func() { + It("reports NetworkAttachmentsReady if the Pods got the proper annotations", func() { internalAPINADName := types.NamespacedName{Namespace: namespace, Name: "internalapi"} nad := CreateNetworkAttachmentDefinition(internalAPINADName) DeferCleanup(DeleteInstance, nad) @@ -571,7 +571,7 @@ var _ = Describe("NovaAPI controller", func() { keystoneEndpointName := types.NamespacedName{Namespace: namespace, Name: "nova"} th.SimulateKeystoneEndpointReady(keystoneEndpointName) - // As the internal enpoint is configured in ExternalEndpoints it does not + // As the internal endpoint is configured in ExternalEndpoints it does not // get a Route but a Service with MetalLB annotations instead service := GetService(types.NamespacedName{Namespace: namespace, Name: "nova-internal"}) Expect(service.Annotations).To( @@ -633,7 +633,7 @@ var _ = Describe("NovaAPI controller", func() { ) }) - It("applys new NetworkAttachments configuration", func() { + It("applies new NetworkAttachments configuration", func() { Eventually(func(g Gomega) { novaAPI := GetNovaAPI(novaAPIName) novaAPI.Spec.NetworkAttachments = append(novaAPI.Spec.NetworkAttachments, "internalapi") diff --git a/test/functional/novacell_controller_test.go b/test/functional/novacell_controller_test.go index ff2a79ecd..915f851e9 100644 --- a/test/functional/novacell_controller_test.go +++ b/test/functional/novacell_controller_test.go @@ -192,7 +192,7 @@ var _ = Describe("NovaCell controller", func() { ) }) - It("applys new NetworkAttachments configuration to its Conductor", func() { + It("applies new NetworkAttachments configuration to its Conductor", func() { Eventually(func(g Gomega) { novaCell := GetNovaCell(novaCellName) novaCell.Spec.ConductorServiceTemplate.NetworkAttachments = append( diff --git a/test/functional/novaconductor_controller_test.go b/test/functional/novaconductor_controller_test.go index 7173a0baf..2b24b7419 100644 --- a/test/functional/novaconductor_controller_test.go +++ b/test/functional/novaconductor_controller_test.go @@ -62,7 +62,7 @@ var _ = Describe("NovaConductor controller", func() { It("has empty Status fields", func() { instance := GetNovaConductor(novaConductorName) // NOTE(gibi): Hash has `omitempty` tags so while - // they are initialized to an empty map that value is omited from + // they are initialized to an empty map that value is omitted from // the output when sent to the client. So we see nils here. Expect(instance.Status.Hash).To(BeEmpty()) Expect(instance.Status.ReadyCount).To(Equal(int32(0))) @@ -77,7 +77,7 @@ var _ = Describe("NovaConductor controller", func() { ) }) - When("an unrealated Secret is created the CR state does not change", func() { + When("an unrelated Secret is created the CR state does not change", func() { BeforeEach(func() { secret := &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ @@ -133,7 +133,7 @@ var _ = Describe("NovaConductor controller", func() { ) }) - It("reports that the inputes are not ready", func() { + It("reports that the inputs are not ready", func() { th.ExpectCondition( novaConductorName, ConditionGetterFunc(NovaConductorConditionGetter), @@ -602,7 +602,7 @@ var _ = Describe("NovaConductor controller", func() { HaveKeyWithValue("k8s.v1.cni.cncf.io/networks", string(expectedAnnotation)), ) - // We simulat that there is no IP associated with the internalapi + // We simulate that there is no IP associated with the internalapi // network attachment SimulateStatefulSetReplicaReadyWithPods( statefulSetName, @@ -619,7 +619,7 @@ var _ = Describe("NovaConductor controller", func() { "not all pods have interfaces with ips as configured in NetworkAttachments: [internalapi]", ) }) - It("reports NetworkAttachmentsReady if the Pods got the proper annotiations", func() { + It("reports NetworkAttachmentsReady if the Pods got the proper annotations", func() { internalAPINADName := types.NamespacedName{Namespace: namespace, Name: "internalapi"} nad := CreateNetworkAttachmentDefinition(internalAPINADName) DeferCleanup(DeleteInstance, nad) @@ -694,7 +694,7 @@ var _ = Describe("NovaConductor controller", func() { ) }) - It("applys new NetworkAttachments configuration", func() { + It("applies new NetworkAttachments configuration", func() { Eventually(func(g Gomega) { novaConductor := GetNovaConductor(novaConductorName) novaConductor.Spec.NetworkAttachments = append(novaConductor.Spec.NetworkAttachments, "internalapi") diff --git a/test/functional/novaexternalcompute_controller_test.go b/test/functional/novaexternalcompute_controller_test.go index 7a7b19400..d072d023b 100644 --- a/test/functional/novaexternalcompute_controller_test.go +++ b/test/functional/novaexternalcompute_controller_test.go @@ -117,12 +117,12 @@ var _ = Describe("NovaExternalCompute", func() { Namespace: namespace, Name: fmt.Sprintf("%s-%s-deploy-libvirt", compute.Spec.NovaInstance, compute.Name), } - SimulateAEESucceded(libvirtAEEName) + SimulateAEESucceeded(libvirtAEEName) novaAEEName := types.NamespacedName{ Namespace: namespace, Name: fmt.Sprintf("%s-%s-deploy-nova", compute.Spec.NovaInstance, compute.Name), } - SimulateAEESucceded(novaAEEName) + SimulateAEESucceeded(novaAEEName) }) @@ -327,12 +327,12 @@ var _ = Describe("NovaExternalCompute", func() { Namespace: namespace, Name: fmt.Sprintf("%s-%s-deploy-libvirt", compute.Spec.NovaInstance, compute.Name), } - SimulateAEESucceded(libvirtAEEName) + SimulateAEESucceeded(libvirtAEEName) novaAEEName := types.NamespacedName{ Namespace: namespace, Name: fmt.Sprintf("%s-%s-deploy-nova", compute.Spec.NovaInstance, compute.Name), } - SimulateAEESucceded(novaAEEName) + SimulateAEESucceeded(novaAEEName) th.ExpectCondition( computeName, diff --git a/test/functional/sample_test.go b/test/functional/sample_test.go index 749e9bea1..15e97d314 100644 --- a/test/functional/sample_test.go +++ b/test/functional/sample_test.go @@ -90,8 +90,8 @@ func CreateNovaExternalComputeFromSample(sampleFileName string, namespace string // This is a set of test for our samples. It only validates that the sample // file has all the required field with proper types. But it does not // validate that using a sample file will result in a working deployment. -// TODO(gibi): By building up all the prerequisits (e.g. MariaDBDatabase) in -// the test and by simulating Job and Deploymnet success we could assert +// TODO(gibi): By building up all the prerequisites (e.g. MariaDBDatabase) in +// the test and by simulating Job and Deployment success we could assert // that each sample creates a CR in Ready state. var _ = Describe("Samples", func() { diff --git a/test/functional/suite_test.go b/test/functional/suite_test.go index f9b4e6960..fde81f336 100644 --- a/test/functional/suite_test.go +++ b/test/functional/suite_test.go @@ -178,7 +178,7 @@ var _ = BeforeSuite(func() { // NOTE(gibi): During envtest we simulate success of tasks (e.g Job, // Deployment, DB) so we can speed up the test execution by reducing the // time we wait before we reconcile when a task is running. - reconcilers.OverriedRequeueTimeout(time.Duration(10) * time.Millisecond) + reconcilers.OverrideRequeueTimeout(time.Duration(10) * time.Millisecond) err = reconcilers.Setup(k8sManager, ctrl.Log.WithName("testSetup")) Expect(err).ToNot(HaveOccurred())