Skip to content

Commit

Permalink
Fix a few typos (#1090)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Schlicht authored and kensipe committed Nov 20, 2019
1 parent 519f965 commit cdae026
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions pkg/apis/kudo/v1beta1/instance_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ func (i *Instance) GetPlanToBeExecuted(ov *OperatorVersion) (*string, error) {
}
if instanceSnapshot.OperatorVersion.Name != i.Spec.OperatorVersion.Name {
// this instance was upgraded to newer version
log.Printf("Instance: instance %s/%s was upgraded from %s to %s operatorversion", i.Namespace, i.Name, instanceSnapshot.OperatorVersion.Name, i.Spec.OperatorVersion.Name)
log.Printf("Instance: instance %s/%s was upgraded from %s to %s operatorVersion", i.Namespace, i.Name, instanceSnapshot.OperatorVersion.Name, i.Spec.OperatorVersion.Name)
plan := selectPlan([]string{UpgradePlanName, UpdatePlanName, DeployPlanName}, ov)
if plan == nil {
return nil, &InstanceError{fmt.Errorf("supposed to execute plan because instance %s/%s was upgraded but none of the deploy, upgrade, update plans found in linked operatorVersion", i.Namespace, i.Name), kudo.String("PlanNotFound")}
Expand All @@ -424,7 +424,7 @@ func (i *Instance) GetPlanToBeExecuted(ov *OperatorVersion) (*string, error) {
paramDefinitions := getParamDefinitions(paramDiff, ov)
plan := planNameFromParameters(paramDefinitions, ov)
if plan == nil {
return nil, &InstanceError{fmt.Errorf("supposed to execute plan because instance %s/%s was updatet but none of the deploy, update plans found in linked operatorVersion", i.Namespace, i.Name), kudo.String("PlanNotFound")}
return nil, &InstanceError{fmt.Errorf("supposed to execute plan because instance %s/%s was updated but none of the deploy, update plans found in linked operatorVersion", i.Namespace, i.Name), kudo.String("PlanNotFound")}
}
return plan, nil
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/instance/instance_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,11 @@ func (r *Reconciler) getOperatorVersion(instance *kudov1beta1.Instance) (ov *kud
},
ov)
if err != nil {
log.Printf("InstanceController: Error getting operatorversion \"%v\" for instance \"%v\": %v",
log.Printf("InstanceController: Error getting operatorVersion \"%v\" for instance \"%v\": %v",
instance.Spec.OperatorVersion.Name,
instance.Name,
err)
r.Recorder.Event(instance, "Warning", "InvalidOperatorVersion", fmt.Sprintf("Error getting operatorversion \"%v\": %v", instance.Spec.OperatorVersion.Name, err))
r.Recorder.Event(instance, "Warning", "InvalidOperatorVersion", fmt.Sprintf("Error getting operatorVersion \"%v\": %v", instance.Spec.OperatorVersion.Name, err))
return nil, err
}
return ov, nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/kudoctl/cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ or '--version' which will replace the version designation on the standard image.
To dump a manifest containing the KUDO deployment YAML, combine the '--dry-run' and '--output=yaml' flags.
Running 'kudo init' on server-side is idempotent - it skips manifests alredy applied to the cluster in previous runs
Running 'kudo init' on server-side is idempotent - it skips manifests already applied to the cluster in previous runs
and finishes with success if KUDO is already installed.
`
initExample = ` # yaml output
Expand Down
4 changes: 2 additions & 2 deletions pkg/test/utils/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ func PrettyDiff(expected runtime.Object, actual runtime.Object) (string, error)
func ConvertUnstructured(in runtime.Object) (runtime.Object, error) {
unstruct, err := runtime.DefaultUnstructuredConverter.ToUnstructured(in)
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("erroring converting %s to unstructured", ResourceID(in)))
return nil, errors.Wrap(err, fmt.Sprintf("error converting %s to unstructured", ResourceID(in)))
}

var converted runtime.Object
Expand All @@ -361,7 +361,7 @@ func ConvertUnstructured(in runtime.Object) (runtime.Object, error) {

err = runtime.DefaultUnstructuredConverter.FromUnstructured(unstruct, converted)
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("erroring converting %s from unstructured", ResourceID(in)))
return nil, errors.Wrap(err, fmt.Sprintf("error converting %s from unstructured", ResourceID(in)))
}

return converted, nil
Expand Down

0 comments on commit cdae026

Please sign in to comment.