Fix typos

api/bases/nova.openstack.org_nova.yaml

@@ -466,8 +466,8 @@ spec:
                       properties:
                         archiveAge:
                           default: 30
-                          description: ArchiveAge defines the minimuma age of the
-                            records in days that can be moved to the shadow tables.
+                          description: ArchiveAge defines the minimum age of the records
+                            in days that can be moved to the shadow tables.
                           minimum: 1
                           type: integer
                         purgeAge:

api/bases/nova.openstack.org_novacells.yaml

@@ -155,7 +155,7 @@ spec:
                 properties:
                   archiveAge:
                     default: 30
-                    description: ArchiveAge defines the minimuma age of the records
+                    description: ArchiveAge defines the minimum age of the records
                       in days that can be moved to the shadow tables.
                     minimum: 1
                     type: integer
@@ -463,7 +463,7 @@ spec:
                     type: object
                 type: object
               noVNCProxyServiceTemplate:
-                description: NoVNCProxyServiceTemplate - defines the novvncproxy service
+                description: NoVNCProxyServiceTemplate - defines the novncproxy service
                   dedicated for the cell.
                 properties:
                   customServiceConfig:

api/bases/nova.openstack.org_novaconductors.yaml

@@ -89,7 +89,7 @@ spec:
                 properties:
                   archiveAge:
                     default: 30
-                    description: ArchiveAge defines the minimuma age of the records
+                    description: ArchiveAge defines the minimum age of the records
                       in days that can be moved to the shadow tables.
                     minimum: 1
                     type: integer

api/v1beta1/novacell_types.go

@@ -164,7 +164,7 @@ type NovaCellSpec struct {
 	MetadataServiceTemplate NovaMetadataTemplate `json:"metadataServiceTemplate"`
 
 	// +kubebuilder:validation:Required
-	// NoVNCProxyServiceTemplate - defines the novvncproxy service dedicated for
+	// NoVNCProxyServiceTemplate - defines the novncproxy service dedicated for
 	// the cell.
 	NoVNCProxyServiceTemplate NovaNoVNCProxyTemplate `json:"noVNCProxyServiceTemplate"`
 
@@ -207,7 +207,7 @@ type NovaCellDBPurge struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=30
 	// +kubebuilder:validation:Minimum=1
-	// ArchiveAge defines the minimuma age of the records in days that can be
+	// ArchiveAge defines the minimum age of the records in days that can be
 	// moved to the shadow tables.
 	ArchiveAge *int `json:"archiveAge"`
 

api/v1beta1/novacompute_types.go

@@ -194,7 +194,7 @@ func NewNovaComputeSpec(
 	computeTemplate NovaComputeTemplate,
 	novaComputeName string,
 ) NovaComputeSpec {
-	novacomputeSpec := NovaComputeSpec{
+	novaComputeSpec := NovaComputeSpec{
 		CellName:    novaCell.CellName,
 		ComputeName: novaComputeName,
 		Secret:      novaCell.Secret,
@@ -213,5 +213,5 @@ func NewNovaComputeSpec(
 		TLS:                    novaCell.TLS,
 		DefaultConfigOverwrite: computeTemplate.DefaultConfigOverwrite,
 	}
-	return novacomputeSpec
+	return novaComputeSpec
 }

config/crd/bases/nova.openstack.org_nova.yaml

@@ -466,8 +466,8 @@ spec:
                       properties:
                         archiveAge:
                           default: 30
-                          description: ArchiveAge defines the minimuma age of the
-                            records in days that can be moved to the shadow tables.
+                          description: ArchiveAge defines the minimum age of the records
+                            in days that can be moved to the shadow tables.
                           minimum: 1
                           type: integer
                         purgeAge:

config/crd/bases/nova.openstack.org_novacells.yaml

@@ -155,7 +155,7 @@ spec:
                 properties:
                   archiveAge:
                     default: 30
-                    description: ArchiveAge defines the minimuma age of the records
+                    description: ArchiveAge defines the minimum age of the records
                       in days that can be moved to the shadow tables.
                     minimum: 1
                     type: integer
@@ -463,7 +463,7 @@ spec:
                     type: object
                 type: object
               noVNCProxyServiceTemplate:
-                description: NoVNCProxyServiceTemplate - defines the novvncproxy service
+                description: NoVNCProxyServiceTemplate - defines the novncproxy service
                   dedicated for the cell.
                 properties:
                   customServiceConfig:

config/crd/bases/nova.openstack.org_novaconductors.yaml

@@ -89,7 +89,7 @@ spec:
                 properties:
                   archiveAge:
                     default: 30
-                    description: ArchiveAge defines the minimuma age of the records
+                    description: ArchiveAge defines the minimum age of the records
                       in days that can be moved to the shadow tables.
                     minimum: 1
                     type: integer

controllers/common.go

@@ -454,7 +454,7 @@ type GetSecret interface {
 	client.Object
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *ReconcilerBase) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("ReconcilerBase")
 }
@@ -548,18 +548,18 @@ func ensureMemcached(
 	ctx context.Context,
 	h *helper.Helper,
 	namespaceName string,
-	mamcachedName string,
+	memcachedName string,
 	conditionUpdater conditionUpdater,
 ) (*memcachedv1.Memcached, error) {
-	memcached, err := memcachedv1.GetMemcachedByName(ctx, h, mamcachedName, namespaceName)
+	memcached, err := memcachedv1.GetMemcachedByName(ctx, h, memcachedName, namespaceName)
 	if err != nil {
 		if k8s_errors.IsNotFound(err) {
 			conditionUpdater.Set(condition.FalseCondition(
 				condition.MemcachedReadyCondition,
 				condition.RequestedReason,
 				condition.SeverityInfo,
 				condition.MemcachedReadyWaitingMessage))
-			return nil, fmt.Errorf("memcached %s not found", mamcachedName)
+			return nil, fmt.Errorf("memcached %s not found", memcachedName)
 		}
 		conditionUpdater.Set(condition.FalseCondition(
 			condition.MemcachedReadyCondition,
@@ -576,7 +576,7 @@ func ensureMemcached(
 			condition.RequestedReason,
 			condition.SeverityInfo,
 			condition.MemcachedReadyWaitingMessage))
-		return nil, fmt.Errorf("memcached %s is not ready", mamcachedName)
+		return nil, fmt.Errorf("memcached %s is not ready", memcachedName)
 	}
 	conditionUpdater.MarkTrue(condition.MemcachedReadyCondition, condition.MemcachedReadyMessage)
 

controllers/nova_controller.go

@@ -65,7 +65,7 @@ type NovaReconciler struct {
 	ReconcilerBase
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *NovaReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("Nova")
 }
@@ -134,7 +134,7 @@ func (r *NovaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resul
 	}
 	Log.Info("Reconciling")
 
-	// Save a copy of the condtions so that we can restore the LastTransitionTime
+	// Save a copy of the conditions so that we can restore the LastTransitionTime
 	// when a condition's state doesn't change.
 	savedConditions := instance.Status.Conditions.DeepCopy()
 
@@ -912,7 +912,7 @@ func (r *NovaReconciler) ensureCell(
 		ServiceUser:     instance.Spec.ServiceUser,
 		KeystoneAuthURL: keystoneAuthURL,
 		ServiceAccount:  instance.RbacResourceName(),
-		// The assumtpion is that the CA bundle for ironic compute in the cell
+		// The assumption is that the CA bundle for ironic compute in the cell
 		// and the conductor in the cell always the same as the NovaAPI
 		TLS:               instance.Spec.APIServiceTemplate.TLS.Ca,
 		PreserveJobs:      instance.Spec.PreserveJobs,
@@ -975,7 +975,7 @@ func (r *NovaReconciler) ensureCell(
 		return cell, status, err
 	}
 
-	// We need to discover computes when cell have computetemplates and mapping is done
+	// We need to discover computes when cell have compute templates and mapping is done
 	status, err = r.ensureNovaComputeDiscover(
 		ctx, h, instance, cell, cellTemplate, scriptName, configName)
 

controllers/novaapi_controller.go

@@ -63,7 +63,7 @@ type NovaAPIReconciler struct {
 	ReconcilerBase
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *NovaAPIReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("NovaAPI")
 }
@@ -122,7 +122,7 @@ func (r *NovaAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
 	}
 	Log.Info("Reconciling")
 
-	// Save a copy of the condtions so that we can restore the LastTransitionTime
+	// Save a copy of the conditions so that we can restore the LastTransitionTime
 	// when a condition's state doesn't change.
 	savedConditions := instance.Status.Conditions.DeepCopy()
 	// initialize status fields
@@ -301,7 +301,7 @@ func (r *NovaAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
 
 	// Only expose the service is the deployment succeeded
 	if !instance.Status.Conditions.IsTrue(condition.DeploymentReadyCondition) {
-		Log.Info("Waiting for the Deployment to become Ready before exposing the sevice in Keystone")
+		Log.Info("Waiting for the Deployment to become Ready before exposing the service in Keystone")
 		return ctrl.Result{}, nil
 	}
 

controllers/novacell_controller.go

@@ -53,7 +53,7 @@ type NovaCellReconciler struct {
 	ReconcilerBase
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *NovaCellReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("NovaCell")
 }
@@ -105,7 +105,7 @@ func (r *NovaCellReconciler) Reconcile(ctx context.Context, req ctrl.Request) (r
 	}
 	Log.Info("Reconciling")
 
-	// Save a copy of the condtions so that we can restore the LastTransitionTime
+	// Save a copy of the conditions so that we can restore the LastTransitionTime
 	// when a condition's state doesn't change.
 	savedConditions := instance.Status.Conditions.DeepCopy()
 	// initialize status fields

controllers/novacompute_controller.go

@@ -55,7 +55,7 @@ type NovaComputeReconciler struct {
 	ReconcilerBase
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLOgger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *NovaComputeReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("NovaCompute")
 }
@@ -113,7 +113,7 @@ func (r *NovaComputeReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 	Log.Info("Reconciling")
 
-	// Save a copy of the condtions so that we can restore the LastTransitionTime
+	// Save a copy of the conditions so that we can restore the LastTransitionTime
 	// when a condition's state doesn't change.
 	savedConditions := instance.Status.Conditions.DeepCopy()
 	// initialize status fields

controllers/novaconductor_controller.go

@@ -58,7 +58,7 @@ type NovaConductorReconciler struct {
 	ReconcilerBase
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *NovaConductorReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("NovaConductor")
 }
@@ -116,7 +116,7 @@ func (r *NovaConductorReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	}
 	Log.Info("Reconciling")
 
-	// Save a copy of the condtions so that we can restore the LastTransitionTime
+	// Save a copy of the conditions so that we can restore the LastTransitionTime
 	// when a condition's state doesn't change.
 	savedConditions := instance.Status.Conditions.DeepCopy()
 	// initialize status fields

controllers/novametadata_controller.go

@@ -60,7 +60,7 @@ type NovaMetadataReconciler struct {
 	ReconcilerBase
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *NovaMetadataReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("NovaMetadata")
 }
@@ -117,7 +117,7 @@ func (r *NovaMetadataReconciler) Reconcile(ctx context.Context, req ctrl.Request
 
 	Log.Info("Reconciling")
 
-	// Save a copy of the condtions so that we can restore the LastTransitionTime
+	// Save a copy of the conditions so that we can restore the LastTransitionTime
 	// when a condition's state doesn't change.
 	savedConditions := instance.Status.Conditions.DeepCopy()
 	// initialize status fields

controllers/novanovncproxy_controller.go

@@ -57,7 +57,7 @@ type NovaNoVNCProxyReconciler struct {
 	ReconcilerBase
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *NovaNoVNCProxyReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("NovaNoVNCProxy")
 }
@@ -116,7 +116,7 @@ func (r *NovaNoVNCProxyReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 
 	Log.Info("Reconciling")
 
-	// Save a copy of the condtions so that we can restore the LastTransitionTime
+	// Save a copy of the conditions so that we can restore the LastTransitionTime
 	// when a condition's state doesn't change.
 	savedConditions := instance.Status.Conditions.DeepCopy()
 

controllers/novascheduler_controller.go

@@ -57,7 +57,7 @@ type NovaSchedulerReconciler struct {
 	ReconcilerBase
 }
 
-// getlogger returns a logger object with a prefix of "conroller.name" and aditional controller context fields
+// GetLogger returns a logger object with a prefix of "controller.name" and additional controller context fields
 func (r *NovaSchedulerReconciler) GetLogger(ctx context.Context) logr.Logger {
 	return log.FromContext(ctx).WithName("Controllers").WithName("NovaScheduler")
 }
@@ -114,7 +114,7 @@ func (r *NovaSchedulerReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	}
 	Log.Info("Reconciling")
 
-	// Save a copy of the condtions so that we can restore the LastTransitionTime
+	// Save a copy of the conditions so that we can restore the LastTransitionTime
 	// when a condition's state doesn't change.
 	savedConditions := instance.Status.Conditions.DeepCopy()
 

pkg/novaconductor/deployment.go

@@ -74,7 +74,7 @@ func StatefulSet(
 
 	envVars := map[string]env.Setter{}
 	envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")
-	// NOTE(gibi): The stateafulset does not use this hash directly. We store it
+	// NOTE(gibi): The statefulset does not use this hash directly. We store it
 	// in the environment to trigger a Pod restart if any input of the
 	// statefulset has changed. The k8s will trigger a restart automatically if
 	// the env changes.

test/functional/nova_compute_ironic_controller_test.go

@@ -277,7 +277,7 @@ var _ = Describe("NovaCompute controller", func() {
 
 var _ = Describe("NovaCompute with ironic diver controller", func() {
 
-	When("with configure cellname", func() {
+	When("with configure cell name", func() {
 		BeforeEach(func() {
 			spec := GetDefaultNovaComputeSpec(cell1)
 			novaCompute := CreateNovaCompute(cell1.NovaComputeName, spec)

test/functional/nova_controller_test.go

@@ -552,7 +552,7 @@ var _ = Describe("Nova controller", func() {
 			th.SimulateJobFailure(cell0.DBSyncJobName)
 		})
 
-		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(
 				cell0.ConductorName,
 				ConditionGetterFunc(NovaConductorConditionGetter),

test/functional/nova_multicell_test.go

@@ -34,7 +34,7 @@ import (
 	"k8s.io/utils/ptr"
 )
 
-var _ = Describe("Nova multicell", func() {
+var _ = Describe("Nova multi cell", func() {
 	BeforeEach(func() {
 		apiMariaDBAccount, apiMariaDBSecret := mariadb.CreateMariaDBAccountAndSecret(
 			novaNames.APIMariaDBDatabaseAccount, mariadbv1.MariaDBAccountSpec{})

test/functional/nova_novncproxy_test.go

@@ -506,8 +506,8 @@ var _ = Describe("NovaNoVNCProxy controller", func() {
 				"service": serviceOverride,
 			}
 
-			noVNCP := CreateNovaNoVNCProxy(cell1.NoVNCProxyName, spec)
-			DeferCleanup(th.DeleteInstance, noVNCP)
+			noVNC := CreateNovaNoVNCProxy(cell1.NoVNCProxyName, spec)
+			DeferCleanup(th.DeleteInstance, noVNC)
 		})
 
 		It("creates ClusterIP service", func() {
@@ -559,8 +559,8 @@ var _ = Describe("NovaNoVNCProxy controller", func() {
 				"service": serviceOverride,
 			}
 
-			noVNCP := CreateNovaNoVNCProxy(cell1.NoVNCProxyName, spec)
-			DeferCleanup(th.DeleteInstance, noVNCP)
+			noVNC := CreateNovaNoVNCProxy(cell1.NoVNCProxyName, spec)
+			DeferCleanup(th.DeleteInstance, noVNC)
 		})
 
 		It("creates LoadBalancer service", func() {