Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
This PR is motivated by the fix openstack-k8s-operators/lib-common#231
  • Loading branch information
gibizer committed Apr 5, 2023
1 parent 7e9aa75 commit 47e441e
Show file tree
Hide file tree
Showing 39 changed files with 128 additions and 128 deletions.
16 changes: 8 additions & 8 deletions api/v1beta1/conditions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -140,5 +140,5 @@ const (
NovaMetadataReadyInitMessage = "NovaMetadata not started"

//NovaMetadataReadyInitMessage
NovaMetadataReadyErrorMessage = "NovaMetadata error occured %s"
NovaMetadataReadyErrorMessage = "NovaMetadata error occurred %s"
)
2 changes: 1 addition & 1 deletion api/v1beta1/novaapi_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions api/v1beta1/novacell_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}
Expand Down Expand Up @@ -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"`
Expand All @@ -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"`
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/novaconductor_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand All @@ -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"`
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/novaexternalcompute_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}

Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/novametadata_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,15 @@ 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
// for the CellName == ""
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"`
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/novascheduler_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"`
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/nova.openstack.org_nova.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/nova.openstack.org_novaapis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions config/crd/bases/nova.openstack.org_novacells.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/nova.openstack.org_novaconductors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/nova.openstack.org_novametadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 == ""'
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/nova.openstack.org_novaschedulers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions controllers/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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)
}

Expand All @@ -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
}
Expand Down Expand Up @@ -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)
}
Expand Down
Loading

0 comments on commit 47e441e

Please sign in to comment.