Skip to content

Commit

Permalink
Spelling (#6215)
Browse files Browse the repository at this point in the history
This PR corrects misspellings identified by the [check-spelling action](https://github.com/marketplace/actions/check-spelling).

The misspellings have been reported at jsoref@0d56327#commitcomment-51603624

The action reports that the changes in this PR would make it happy: jsoref@03a9c31

Note: this PR does not include the action. If you're interested in running a spell check on every PR and push, that can be offered separately.

Signed-off-by: Josh Soref <[email protected]>
  • Loading branch information
jsoref authored Jun 7, 2021
1 parent a836105 commit 0be792f
Show file tree
Hide file tree
Showing 42 changed files with 74 additions and 74 deletions.
8 changes: 4 additions & 4 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ about testing from source can be found in the [TEST.md](TEST.md) guide.
- [First time setup](#first-time-setup)
- [Run web standalone](#run-web-standalone)
- [Webpack dev server](#webpack-dev-server)
- [Javascript dependencies](#javascript-dependencies)
- [JavaScript dependencies](#javascript-dependencies)
- [Translations](#translations)
- [Rust](#rust)
- [Docker](#docker)
Expand Down Expand Up @@ -73,7 +73,7 @@ its extensions are written in Go. The dashboard UI is a React application.
- [`web`](web): Provides a UI dashboard to view and drive the control plane.
- [`multicluster extension`](multicluster)
- [`linkerd-gateway`]: Accepts requests from other clusters and forwards them
to the appropriate destionation in the local cluster.
to the appropriate destination in the local cluster.
- [`linkerd-service-mirror-xxx`](multicluster/service-mirror): Controller
observing the labeling of exported services in the target cluster, each one
for which it will create a mirrored service in the local cluster.
Expand Down Expand Up @@ -375,13 +375,13 @@ To develop with a webpack dev server:
on :8185
- `grafana` is port-forwarded from the Kubernetes cluster via `kubectl` on
:3000
- `metrics-api` is port-forwarded from the Kubernets cluster via `kubectl`
- `metrics-api` is port-forwarded from the Kubernetes cluster via `kubectl`
on :8085

2. Go to [http://localhost:7777](http://localhost:7777) to see everything
running.

#### Javascript dependencies
#### JavaScript dependencies

To add a JS dependency:

Expand Down
10 changes: 5 additions & 5 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ if you are upgrading from `2.9.x` or below versions.
longer draggable.
* Updated dashboard build to use webpack v5
* Added CA certs to the Viz extension's metrics-api container so
that it can validate the certifcate of an external Prometheus
that it can validate the certificate of an external Prometheus
* Removed components from the control plane dashboard that now
are part of the Viz extension
* Changed web's base image from debian to scratch
Expand Down Expand Up @@ -320,13 +320,13 @@ Thanks to all our 2.10 users who helped discover these issues!
* Modified the proxy-injector to add the opaque ports annotation to pods if
their namespace has it set
* Added CA certs to the Viz extension's `metrics-api` container so that it can
validate the certifcate of an external Prometheus
validate the certificate of an external Prometheus
* Fixed an issue where inbound TLS detection from non-meshed workloads could
break
* Fixed an issue where the admin server's HTTP detection would fail and not
recover; these are now handled gracefully and without logging warnings
* Aligned the Helm installation heartbeat schedule to match that of the CLI
* Fixed an issue with Multicluster's serivce mirror where it's endpoint repair
* Fixed an issue with Multicluster's service mirror where it's endpoint repair
retries were not properly rate limited
* Removed components from the control plane dashboard that now are part of the
Viz extension
Expand Down Expand Up @@ -704,7 +704,7 @@ the robustness of the opaque transport.
* Changed opaque-port transport to be advertised via ALPN so that new proxies
will not initiate opaque-transport connections to proxies from prior edge
releases
* Added inbound proxy transport metrics with `tls="passhtru"` when forwarding
* Added inbound proxy transport metrics with `tls="passthru"` when forwarding
non-mesh TLS connections
* Thanks to @hs0210 for adding new unit tests!

Expand Down Expand Up @@ -853,7 +853,7 @@ async runtime.
`linkerd-jaeger` extension is working correctly
* Added new `linkerd jaeger uninstall` CLI command to print the `linkerd-jaeger`
extension's resources so that they can be piped into `kubectl delete`
* Fixed an issue where the `linkerd-cni` daemgitonset may not be installed on all
* Fixed an issue where the `linkerd-cni` daemonset may not be installed on all
intended nodes, due to missing tolerations to the `linkerd-cni` Helm chart
(thanks @rish-onesignal!)
* Fixed an issue where the `tap` APIServer would not refresh its certs
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Describe any implementation changes which are particularly complex or
unintuitive.

List any follow-up work that will need to be done in a future PR and link to any
relevant Github issues.
relevant GitHub issues.

#### Validation ####

Expand Down
6 changes: 3 additions & 3 deletions TEST.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ of this repo, unless otherwise indicated by a `cd` command.

- [Unit tests](#unit-tests)
- [Go](#go)
- [Javascript](#javascript)
- [JavaScript](#javascript)
- [Shell](#shell)
- [Integration tests](#integration-tests)
- [Prerequisites](#prerequisites)
Expand Down Expand Up @@ -54,9 +54,9 @@ automatically regenerated with the command:
go test ./cli/cmd/... --update
```

### Javascript
### JavaScript

Javascript dependencies are managed via [yarn](https://yarnpkg.com/) and
JavaScript dependencies are managed via [yarn](https://yarnpkg.com/) and
[webpack](https://webpack.js.org/). We use
[jest](https://facebook.github.io/jest) as our test runner.

Expand Down
6 changes: 3 additions & 3 deletions bin/_test-helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ handle_tests_input() {
exit 64
fi
if [ -n "$linkerd_path" ]; then
echo "Multliple linkerd paths specified:" >&2
echo "Multiple linkerd paths specified:" >&2
echo " $linkerd_path" >&2
echo " $1" >&2
tests_usage "$0" >&2
Expand Down Expand Up @@ -167,7 +167,7 @@ handle_cleanup_input() {
exit 64
fi
if [ -n "$linkerd_path" ]; then
echo "Multliple linkerd paths specified:" >&2
echo "Multiple linkerd paths specified:" >&2
echo " $linkerd_path" >&2
echo " $1" >&2
cleanup_usage "$0" >&2
Expand Down Expand Up @@ -578,7 +578,7 @@ run_external-resources_test(){
}

# exit_on_err should be called right after a command to check the result status
# and eventually generate a Github error annotation. Do not use after calls to
# and eventually generate a GitHub error annotation. Do not use after calls to
# `go test` as that generates its own annotations. Note this should be called
# outside subshells in order for the script to terminate.
exit_on_err() {
Expand Down
6 changes: 3 additions & 3 deletions charts/linkerd2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ helm install \

## Get involved

* Check out Linkerd's source code at [Github][linkerd2].
* Check out Linkerd's source code at [GitHub][linkerd2].
* Join Linkerd's [user mailing list][linkerd-users], [developer mailing
list][linkerd-dev], and [announcements mailing list][linkerd-announce].
* Follow [@linkerd][twitter] on Twitter.
Expand Down Expand Up @@ -188,8 +188,8 @@ Kubernetes: `>=1.16.0-0`
| proxy.uid | int | `2102` | User id under which the proxy runs |
| proxy.waitBeforeExitSeconds | int | `0` | If set the proxy sidecar will stay alive for at least the given period before receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. See [Lifecycle hooks](https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks) for more info on container lifecycle hooks. |
| proxyInit.closeWaitTimeoutSecs | int | `0` | |
| proxyInit.ignoreInboundPorts | string | `""` | Default set of inbound ports to skip via itpables |
| proxyInit.ignoreOutboundPorts | string | `""` | Default set of outbound ports to skip via itpables |
| proxyInit.ignoreInboundPorts | string | `""` | Default set of inbound ports to skip via iptables |
| proxyInit.ignoreOutboundPorts | string | `""` | Default set of outbound ports to skip via iptables |
| proxyInit.image.name | string | `"cr.l5d.io/linkerd/proxy-init"` | Docker image for the proxy-init container |
| proxyInit.image.pullPolicy | string | imagePullPolicy | Pull policy for the proxy-init container Docker image |
| proxyInit.image.version | string | `"v1.3.12"` | Tag for the proxy-init container Docker image |
Expand Down
2 changes: 1 addition & 1 deletion charts/linkerd2/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ helm install \

## Get involved

* Check out Linkerd's source code at [Github][linkerd2].
* Check out Linkerd's source code at [GitHub][linkerd2].
* Join Linkerd's [user mailing list][linkerd-users], [developer mailing
list][linkerd-dev], and [announcements mailing list][linkerd-announce].
* Follow [@linkerd][twitter] on Twitter.
Expand Down
4 changes: 2 additions & 2 deletions charts/linkerd2/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ proxy:

# proxy-init configuration
proxyInit:
# -- Default set of inbound ports to skip via itpables
# -- Default set of inbound ports to skip via iptables
ignoreInboundPorts: ""
# -- Default set of outbound ports to skip via itpables
# -- Default set of outbound ports to skip via iptables
ignoreOutboundPorts: ""
image:
# -- Docker image for the proxy-init container
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/inject.go
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ func (rt resourceTransformerInject) transform(bytes []byte) ([]byte, []inject.Re

if rt.injectProxy {
// delete the inject annotation if present as its not needed in the manual case
// prevents injector from taking a different code path in the ignress mode
// prevents injector from taking a different code path in the ingress mode
delete(rt.overrideAnnotations, k8s.ProxyInjectAnnotation)
conf.AppendPodAnnotation(k8s.CreatedByAnnotation, k8s.CreatedByAnnotationValue())
} else if !rt.values.Proxy.IsIngress { // Add enabled annotation only if its not ingress mode to prevent overriding the annotation
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/repair.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var (
// 2.8 and below
repairNotApplicableVersionRegex = regexp.MustCompile(`^stable-2\.[0-8]\.([0-9]+)$`)

// repairApplicableVersionRegex matches versions 2.9 versions upto 2.9.4
// repairApplicableVersionRegex matches versions 2.9 versions up to 2.9.4
repairApplicableVersionRegex = regexp.MustCompile(`^stable-2\.9\.[0-4]$`)
)

Expand Down Expand Up @@ -87,7 +87,7 @@ func repair(ctx context.Context, forced bool) error {
return fmt.Errorf("repair command is only applicable to 2.9 control-plane versions. Please try upgrading to the latest supported versions of Linkerd i.e 2.9.4 and above")
}

// Suggest 2.9.4 CLI version for all 2.9 server versions upto 2.9.4
// Suggest 2.9.4 CLI version for all 2.9 server versions up to 2.9.4
if repairApplicableVersionRegex.Match([]byte(serverVersion)) {
return fmt.Errorf("Please run the repair command with a `stable-2.9.4` CLI.\nRun `curl -sL https://run.linkerd.io/install | LINKERD2_VERSION=\"stable-2.9.4\" sh` to install the server version of the CLI")
}
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/uninstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This command provides all Kubernetes namespace-scoped and cluster-scoped resourc
if !force {

var fail bool
// Retrtieve any installed extensions
// Retrieve any installed extensions
extensionNamespaces, err := k8sAPI.GetAllNamespacesWithExtensionLabel(cmd.Context())
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func upgrade(ctx context.Context, k *k8s.KubernetesAPI, flags []flag.Flag, stage
return bytes.Buffer{}, err
}
// If there is no linkerd-config-overrides secret, assume we are upgrading
// from a verion of Linkerd prior to the introduction of this secret. In
// from a version of Linkerd prior to the introduction of this secret. In
// this case we load the values from the legacy linkerd-config configmap.
if values == nil {
values, err = loadStoredValuesLegacy(ctx, k)
Expand Down
2 changes: 1 addition & 1 deletion controller/api/destination/endpoint_translator.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ func (et *endpointTranslator) sendClientAdd(set watcher.AddressSet) {

skippedInboundPorts, skippedErr := getPodSkippedInboundPortsAnnotations(address.Pod)
if skippedErr != nil {
et.log.Errorf("failed getting ignored inbound ports annoatation for pod: %s", err)
et.log.Errorf("failed getting ignored inbound ports annotation for pod: %s", err)
}

wa, err = toWeightedAddr(address, opaquePorts, skippedInboundPorts, et.enableH2Upgrade, et.identityTrustDomain, et.controllerNS, et.log)
Expand Down
2 changes: 1 addition & 1 deletion controller/api/destination/watcher/opaque_ports_watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func (opw *OpaquePortsWatcher) Subscribe(id ServiceID, listener OpaquePortsUpdat
return nil
}

// Unsubscribe unsubscries a listener from service.
// Unsubscribe unsubscribes a listener from service.
func (opw *OpaquePortsWatcher) Unsubscribe(id ServiceID, listener OpaquePortsUpdateListener) {
opw.Lock()
defer opw.Unlock()
Expand Down
2 changes: 1 addition & 1 deletion jaeger/charts/linkerd-jaeger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ helm install linkerd/linkerd-jaeger

## Get involved

* Check out Linkerd's source code at [Github][linkerd2].
* Check out Linkerd's source code at [GitHub][linkerd2].
* Join Linkerd's [user mailing list][linkerd-users], [developer mailing
list][linkerd-dev], and [announcements mailing list][linkerd-announce].
* Follow [@linkerd][twitter] on Twitter.
Expand Down
2 changes: 1 addition & 1 deletion jaeger/charts/linkerd-jaeger/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ helm install linkerd/linkerd-jaeger

## Get involved

* Check out Linkerd's source code at [Github][linkerd2].
* Check out Linkerd's source code at [GitHub][linkerd2].
* Join Linkerd's [user mailing list][linkerd-users], [developer mailing
list][linkerd-dev], and [announcements mailing list][linkerd-announce].
* Follow [@linkerd][twitter] on Twitter.
Expand Down
2 changes: 1 addition & 1 deletion jaeger/charts/linkerd-jaeger/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ webhooks:
namespace: {{ .Values.namespace }}
path: "/"
{{- if and (.Values.webhook.externalSecret) (empty .Values.webhook.caBundle) }}
{{- fail "If webhook.externalSecret is true then you need to provide webook.caBundle" }}
{{- fail "If webhook.externalSecret is true then you need to provide webhook.caBundle" }}
{{- end }}
caBundle: {{ ternary (b64enc (trim $ca.Cert)) (b64enc (trim .Values.webhook.caBundle)) (empty .Values.webhook.caBundle) }}
failurePolicy: {{.Values.webhook.failurePolicy}}
Expand Down
2 changes: 1 addition & 1 deletion jaeger/cmd/install_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func TestRender(t *testing.T) {
// pin values that are changed by render functions on each test run
defaultValues := map[string]interface{}{
"webhook": map[string]interface{}{
"keyPEM": "test-webhhook-key-pem",
"keyPEM": "test-webhook-key-pem",
"crtPEM": "test-webhook-crt-pem",
"caBundle": "test-webhook-ca-bundle",
},
Expand Down
2 changes: 1 addition & 1 deletion jaeger/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ var (
alphaNumDash = regexp.MustCompile(`^[a-zA-Z0-9-]+$`)
)

// NewCmdJaeger returns a new jeager command
// NewCmdJaeger returns a new jaeger command
func NewCmdJaeger() *cobra.Command {
jaegerCmd := &cobra.Command{
Use: "jaeger",
Expand Down
4 changes: 2 additions & 2 deletions jaeger/cmd/testdata/install_collector_disabled.golden
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 5bd7cf79e2089450866c91a4f139e93835bef192c11323db78aeb8c255fcf3b4
checksum/config: 7cd13a5efac387ff6fffe14bdce45a64b0b462af3e55e8b0532c65a3140914d7
labels:
linkerd.io/extension: jaeger
component: jaeger-injector
Expand Down Expand Up @@ -134,7 +134,7 @@ metadata:
type: kubernetes.io/tls
data:
tls.crt: dGVzdC13ZWJob29rLWNydC1wZW0=
tls.key: dGVzdC13ZWJoaG9vay1rZXktcGVt
tls.key: dGVzdC13ZWJob29rLWtleS1wZW0=
---
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
Expand Down
4 changes: 2 additions & 2 deletions jaeger/cmd/testdata/install_default.golden
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
template:
metadata:
annotations:
checksum/config: cc99e06df34fab44bf1a6b2a80839f971716ff9ee14c130b9d74f0a0a3d60605
checksum/config: 1388bf30cdbc3236d7a52e0a115ee8ae1095140cb5b89c7b97fd30fdffad07f9
labels:
linkerd.io/extension: jaeger
component: jaeger-injector
Expand Down Expand Up @@ -143,7 +143,7 @@ metadata:
type: kubernetes.io/tls
data:
tls.crt: dGVzdC13ZWJob29rLWNydC1wZW0=
tls.key: dGVzdC13ZWJoaG9vay1rZXktcGVt
tls.key: dGVzdC13ZWJob29rLWtleS1wZW0=
---
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
Expand Down
4 changes: 2 additions & 2 deletions jaeger/cmd/testdata/install_jaeger_disabled.golden
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 526f4fb77f64bd384cc6913967444c5faec551a8cba1ad2cb87cb77ef767318d
checksum/config: 0cf88aabfdb59ab401cb17b59e26b57277ca6c039ec4837e2523759802565c1b
labels:
linkerd.io/extension: jaeger
component: jaeger-injector
Expand Down Expand Up @@ -143,7 +143,7 @@ metadata:
type: kubernetes.io/tls
data:
tls.crt: dGVzdC13ZWJob29rLWNydC1wZW0=
tls.key: dGVzdC13ZWJoaG9vay1rZXktcGVt
tls.key: dGVzdC13ZWJob29rLWtleS1wZW0=
---
apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration
Expand Down
6 changes: 3 additions & 3 deletions jaeger/injector/mutator/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/linkerd/linkerd2/controller/k8s"
"github.com/linkerd/linkerd2/controller/webhook"
"github.com/linkerd/linkerd2/jaeger/pkg/labels"
l5dLables "github.com/linkerd/linkerd2/pkg/k8s"
l5dLabels "github.com/linkerd/linkerd2/pkg/k8s"
"github.com/prometheus/common/log"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
corev1 "k8s.io/api/core/v1"
Expand All @@ -19,8 +19,8 @@ import (
)

const (
collectorSvcAddrAnnotation = l5dLables.ProxyConfigAnnotationsPrefix + "/trace-collector"
collectorSvcAccountAnnotation = l5dLables.ProxyConfigAnnotationsPrefixAlpha +
collectorSvcAddrAnnotation = l5dLabels.ProxyConfigAnnotationsPrefix + "/trace-collector"
collectorSvcAccountAnnotation = l5dLabels.ProxyConfigAnnotationsPrefixAlpha +
"/trace-collector-service-account"
)

Expand Down
2 changes: 1 addition & 1 deletion multicluster/charts/linkerd-multicluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ helm install linkerd/linkerd-multicluster

## Get involved

* Check out Linkerd's source code at [Github][linkerd2].
* Check out Linkerd's source code at [GitHub][linkerd2].
* Join Linkerd's [user mailing list][linkerd-users], [developer mailing
list][linkerd-dev], and [announcements mailing list][linkerd-announce].
* Follow [@linkerd][twitter] on Twitter.
Expand Down
2 changes: 1 addition & 1 deletion multicluster/charts/linkerd-multicluster/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ helm install linkerd/linkerd-multicluster

## Get involved

* Check out Linkerd's source code at [Github][linkerd2].
* Check out Linkerd's source code at [GitHub][linkerd2].
* Join Linkerd's [user mailing list][linkerd-users], [developer mailing
list][linkerd-dev], and [announcements mailing list][linkerd-announce].
* Follow [@linkerd][twitter] on Twitter.
Expand Down
2 changes: 1 addition & 1 deletion multicluster/values/values.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type Values struct {
TargetClusterName string `json:"targetClusterName"`
}

// Gateway contains all opttions related to the Gateway Service
// Gateway contains all options related to the Gateway Service
type Gateway struct {
Enabled bool `json:"enabled"`
Name string `json:"name"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/charts/charts.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func OverrideFromFile(values map[string]interface{}, fs http.FileSystem, chartNa
}

// MergeMaps returns the resultant map after merging given two maps of type map[string]interface{}
// The inputs are not mutated and the second map i.e b's values take predence during merge.
// The inputs are not mutated and the second map i.e b's values take precedence during merge.
// This gives semantically correct merge compared with `mergo.Merge` (with boolean values).
// See https://github.com/imdario/mergo/issues/129
func MergeMaps(a, b map[string]interface{}) map[string]interface{} {
Expand Down
Loading

0 comments on commit 0be792f

Please sign in to comment.