Skip to content

Commit

Permalink
Merge pull request #324 from jsoref/spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
endocrimes authored Oct 17, 2024
2 parents 818521e + 70b0eac commit c1b079c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ HELMIFY ?= $(LOCALBIN)/helmify
## Tool Versions
KUSTOMIZE_VERSION ?= v5.2.1
CONTROLLER_TOOLS_VERSION ?= v0.14.0
HELMIFY_VESRION ?= v0.4.10
HELMIFY_VERSION ?= v0.4.10

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
Expand All @@ -287,7 +287,7 @@ $(ENVTEST): $(LOCALBIN)
.PHONY: helmify
helmify: $(HELMIFY) ## Download helmify locally if necessary.
$(HELMIFY): $(LOCALBIN)
@test -s $(LOCALBIN)/helmify || GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@$(HELMIFY_VESRION)
@test -s $(LOCALBIN)/helmify || GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@$(HELMIFY_VERSION)

.PHONY: e2e
e2e: ## Run e2e tests
Expand Down
2 changes: 1 addition & 1 deletion apps/order-processor/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ func init() {
})
}

// main functiion must be included for the compiler but is not executed.
// main function must be included for the compiler but is not executed.
func main() {}
4 changes: 2 additions & 2 deletions config/crd/bases/core.spinoperator.dev_spinapps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1620,13 +1620,13 @@ spec:
type: object
hostPath:
description: |-
hostPath represents a pre-existing file or directory on the host
hostPath represents a preexisting file or directory on the host
machine that is directly exposed to the container. This is generally
used for system agents or other privileged things that are allowed
to see the host machine. Most containers will NOT need this.
More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
---
TODO(jonesdl) We need to restrict who can use host directory mounts and who can/can not
TODO(jonesdl) We need to restrict who can use host directory mounts and who can/cannot
mount host directories as read/write.
properties:
path:
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/spinapp_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func (r *SpinAppReconciler) ensureCASecret(ctx context.Context, caSecretName, na
}

err := r.Client.Get(ctx, types.NamespacedName{Name: caSecretName, Namespace: namespace}, secret)
if !apierrors.IsNotFound(err) { // secret is not not found
if !apierrors.IsNotFound(err) {
return nil
}
return r.Client.Create(ctx, secret)
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/spinapp_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ func TestConstructDeployment_WithPodLabels(t *testing.T) {
require.Equal(t, deployment.Spec.Template.Labels[key], value)
}

func TestReconcile_Integration_AnnotationAndLabelPropagataion(t *testing.T) {
func TestReconcile_Integration_AnnotationAndLabelPropagation(t *testing.T) {
t.Parallel()

envTest, mgr, _ := setupController(t)
Expand Down
4 changes: 2 additions & 2 deletions internal/logging/logr_logger.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Package logging provides the operators's recommended logging interface.
//
// The logging interface avoids the complexity of levels and provides a simpler
// api that makes it harder to introduce unnecesasry ambiguity to logs (or
// api that makes it harder to introduce unnecessary ambiguity to logs (or
// ascribing value to arbitrary magic numbers).
//
// An Error logging helper exists primarily to facilitate including a stack trace
Expand Down Expand Up @@ -54,7 +54,7 @@ func (l nopLogger) WithValues(_ ...any) Logger { return nopLogger{} }

// NewLogrLogger returns a Logger that is satisfied by the supplied logr.Logger,
// which may be satisfied in turn by various logging implementations.
// Debug messages are logged at V(1) - following the reccomendation of
// Debug messages are logged at V(1) - following the recommendation of
// controller-runtime.
func NewLogrLogger(l logr.Logger) Logger {
return logrLogger{log: l}
Expand Down

0 comments on commit c1b079c

Please sign in to comment.