diff --git a/pkg/apis/kudo/v1beta1/instance_types.go b/pkg/apis/kudo/v1beta1/instance_types.go index 41b88b290..494378aad 100644 --- a/pkg/apis/kudo/v1beta1/instance_types.go +++ b/pkg/apis/kudo/v1beta1/instance_types.go @@ -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")} @@ -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 } diff --git a/pkg/controller/instance/instance_controller.go b/pkg/controller/instance/instance_controller.go index 7d9612f15..7db2dcfd6 100644 --- a/pkg/controller/instance/instance_controller.go +++ b/pkg/controller/instance/instance_controller.go @@ -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 diff --git a/pkg/kudoctl/cmd/init.go b/pkg/kudoctl/cmd/init.go index 9dd2cffb1..760f177ef 100644 --- a/pkg/kudoctl/cmd/init.go +++ b/pkg/kudoctl/cmd/init.go @@ -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 diff --git a/pkg/test/utils/kubernetes.go b/pkg/test/utils/kubernetes.go index 231f1d6ae..6a78e1568 100644 --- a/pkg/test/utils/kubernetes.go +++ b/pkg/test/utils/kubernetes.go @@ -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 @@ -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