mirror of https://github.com/linkerd/linkerd2.git
Spelling (#6215)
This PR corrects misspellings identified by the [check-spelling action](https://github.com/marketplace/actions/check-spelling). The misspellings have been reported at0d56327e6f (commitcomment-51603624)The action reports that the changes in this PR would make it happy:03a9c310aaNote: 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 <jsoref@users.noreply.github.com>
This commit is contained in:
Josh Soref
GitHub
parent
a836105d36
commit
0be792fadc
8
BUILD.md
8
BUILD.md
|
|
@ -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)
|
||||
|
|
@ -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.
|
||||
|
|
@ -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:
|
||||
|
||||
|
|
|
|||
10
CHANGES.md
10
CHANGES.md
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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!
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 ####
|
||||
|
||||
|
|
|
|||
6
TEST.md
6
TEST.md
|
|
@ -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)
|
||||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
@ -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 |
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]$`)
|
||||
)
|
||||
|
||||
|
|
@ -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")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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}}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ spec:
|
|||
template:
|
||||
metadata:
|
||||
annotations:
|
||||
checksum/config: 5bd7cf79e2089450866c91a4f139e93835bef192c11323db78aeb8c255fcf3b4
|
||||
checksum/config: 7cd13a5efac387ff6fffe14bdce45a64b0b462af3e55e8b0532c65a3140914d7
|
||||
labels:
|
||||
linkerd.io/extension: jaeger
|
||||
component: jaeger-injector
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ spec:
|
|||
template:
|
||||
metadata:
|
||||
annotations:
|
||||
checksum/config: cc99e06df34fab44bf1a6b2a80839f971716ff9ee14c130b9d74f0a0a3d60605
|
||||
checksum/config: 1388bf30cdbc3236d7a52e0a115ee8ae1095140cb5b89c7b97fd30fdffad07f9
|
||||
labels:
|
||||
linkerd.io/extension: jaeger
|
||||
component: jaeger-injector
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ spec:
|
|||
template:
|
||||
metadata:
|
||||
annotations:
|
||||
checksum/config: 526f4fb77f64bd384cc6913967444c5faec551a8cba1ad2cb87cb77ef767318d
|
||||
checksum/config: 0cf88aabfdb59ab401cb17b59e26b57277ca6c039ec4837e2523759802565c1b
|
||||
labels:
|
||||
linkerd.io/extension: jaeger
|
||||
component: jaeger-injector
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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"`
|
||||
|
|
|
|||
|
|
@ -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{} {
|
||||
|
|
|
|||
|
|
@ -1792,7 +1792,7 @@ func (hc *HealthChecker) FetchCredsFromSecret(ctx context.Context, namespace str
|
|||
return cred, nil
|
||||
}
|
||||
|
||||
// FetchCredsFromOldSecret function can be removed in later versions, once eihter all webhook secrets are recreated for each update
|
||||
// FetchCredsFromOldSecret function can be removed in later versions, once either all webhook secrets are recreated for each update
|
||||
// (see https://github.com/linkerd/linkerd2/issues/4813)
|
||||
// or later releases are only expected to update from the new names.
|
||||
func (hc *HealthChecker) FetchCredsFromOldSecret(ctx context.Context, namespace string, secretName string) (*tls.Cred, error) {
|
||||
|
|
@ -1942,7 +1942,7 @@ func (hc *HealthChecker) checkServiceAccounts(ctx context.Context, saNames []str
|
|||
return CheckServiceAccounts(ctx, hc.kubeAPI, saNames, ns, labelSelector)
|
||||
}
|
||||
|
||||
// CheckServiceAccounts check for serivceaccounts
|
||||
// CheckServiceAccounts check for serviceaccounts
|
||||
func CheckServiceAccounts(ctx context.Context, api *k8s.KubernetesAPI, saNames []string, ns, labelSelector string) error {
|
||||
options := metav1.ListOptions{
|
||||
LabelSelector: labelSelector,
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ type ResourceConfig struct {
|
|||
meta *metav1.ObjectMeta
|
||||
// This fields hold labels and annotations which are to be added to the
|
||||
// injected resource. This is different from meta.Labels and
|
||||
// meta.Annotationswhich are the labels and annotations on the original
|
||||
// meta.Annotations which are the labels and annotations on the original
|
||||
// resource before injection.
|
||||
labels map[string]string
|
||||
annotations map[string]string
|
||||
|
|
@ -248,7 +248,7 @@ func (conf *ResourceConfig) ParseMetaAndYAML(bytes []byte) (*Report, error) {
|
|||
}
|
||||
|
||||
// GetOverriddenValues returns the final Values struct which is created
|
||||
// by overiding annoatated configuration on top of default Values
|
||||
// by overriding annotated configuration on top of default Values
|
||||
func (conf *ResourceConfig) GetOverriddenValues() (*linkerd2.Values, error) {
|
||||
// Make a copy of Values and mutate that
|
||||
copyValues, err := conf.values.DeepCopy()
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ func NewCommandCompletion(
|
|||
}
|
||||
|
||||
// Complete accepts a list of arguments and a substring to generate CLI suggestions.
|
||||
// `args` represent a list of arguments a user has already enterd in the CLI. These
|
||||
// `args` represent a list of arguments a user has already entered in the CLI. These
|
||||
// arguments are used for determining what resource type we'd like to receive
|
||||
// suggestions for as well as a list of resources names that have already provided.
|
||||
// `toComplete` represents the string prefix of a resource name that we'd like to
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ const (
|
|||
// Enabled is used by annotations whose valid values include "enabled".
|
||||
Enabled = "enabled"
|
||||
|
||||
// Disabled is used by annotations whose valid values incluce "disabled".
|
||||
// Disabled is used by annotations whose valid values include "disabled".
|
||||
Disabled = "disabled"
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ func NewNamespaced(apiVersion, kind, name, namespace string) Kubernetes {
|
|||
}
|
||||
}
|
||||
|
||||
// RenderResource renders a kuberetes object as a yaml object
|
||||
// RenderResource renders a kubernetes object as a yaml object
|
||||
func (r Kubernetes) RenderResource(w io.Writer) error {
|
||||
b, err := yaml.Marshal(r)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ func BytesToTree(bytes []byte) (Tree, error) {
|
|||
return tree, nil
|
||||
}
|
||||
|
||||
// Diff mashals two objects into their yaml representations and then performs
|
||||
// Diff marshals two objects into their yaml representations and then performs
|
||||
// a diff on those Trees. It returns a Tree which represents all of the fields
|
||||
// in y which differ from x.
|
||||
func Diff(x interface{}, y interface{}) (Tree, error) {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ func TestTreeGetString(t *testing.T) {
|
|||
},
|
||||
{
|
||||
values,
|
||||
[]string{"global", "namespac"},
|
||||
[]string{"global", "namespace"},
|
||||
"",
|
||||
fmt.Errorf("could not find node global"),
|
||||
},
|
||||
|
|
|
|||
|
|
@ -446,7 +446,7 @@ func TestInstallOrUpgradeCli(t *testing.T) {
|
|||
"kubectl apply command failed\n%s", out)
|
||||
}
|
||||
|
||||
// Update args to use external proemtheus
|
||||
// Update args to use external prometheus
|
||||
vizArgs = append(vizArgs, "--set", "prometheusUrl=http://prometheus.external-prometheus.svc.cluster.local:9090", "--set", "prometheus.enabled=false")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ func TestOpaquePorts(t *testing.T) {
|
|||
// Wait for slow-cookers to start sending requests
|
||||
time.Sleep(20 * time.Second)
|
||||
|
||||
t.Run("expect absent HTTP outbound requests for opaque-pod slow clooker", func(t *testing.T) {
|
||||
t.Run("expect absent HTTP outbound requests for opaque-pod slow cooker", func(t *testing.T) {
|
||||
// Check the slow cooker metrics
|
||||
pods, err := TestHelper.GetPods(ctx, opaquePortsNs, map[string]string{"app": opaquePodSC})
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ func checkTrafficMetrics(metrics v1alpha1.TrafficMetrics, name string) error {
|
|||
if metrics.Name == name {
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("excpected %s, but got %s", name, metrics.Name)
|
||||
return fmt.Errorf("expected %s, but got %s", name, metrics.Name)
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -156,5 +156,5 @@ func checkTrafficMetricsList(metrics v1alpha1.TrafficMetricsList, name string, n
|
|||
if metrics.Resource.Name == name && len(metrics.Items) == numberOfEdges {
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("excpected %s with %d edges, but got %s with %d edges", name, numberOfEdges, metrics.Resource.Name, len(metrics.Items))
|
||||
return fmt.Errorf("expected %s with %d edges, but got %s with %d edges", name, numberOfEdges, metrics.Resource.Name, len(metrics.Items))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ func echoAnnotationWarn(t *testing.T, args ...interface{}) {
|
|||
|
||||
// Error is a wrapper around t.Error()
|
||||
// args are passed to t.Error(args) and each arg will be sent to stdout formatted
|
||||
// as a Github annotation when the envFlag environment variable is set
|
||||
// as a GitHub annotation when the envFlag environment variable is set
|
||||
func Error(t *testing.T, args ...interface{}) {
|
||||
t.Helper()
|
||||
echoAnnotationErr(t, args...)
|
||||
|
|
@ -66,7 +66,7 @@ func Error(t *testing.T, args ...interface{}) {
|
|||
}
|
||||
|
||||
// AnnotatedError is similar to Error() but it also admits a msg string that
|
||||
// will be used as the Github annotation
|
||||
// will be used as the GitHub annotation
|
||||
func AnnotatedError(t *testing.T, msg string, args ...interface{}) {
|
||||
t.Helper()
|
||||
echoAnnotationErr(t, msg)
|
||||
|
|
@ -75,7 +75,7 @@ func AnnotatedError(t *testing.T, msg string, args ...interface{}) {
|
|||
|
||||
// Errorf is a wrapper around t.Errorf()
|
||||
// format and args are passed to t.Errorf(format, args) and the formatted
|
||||
// message will be sent to stdout as a Github annotation when the envFlag
|
||||
// message will be sent to stdout as a GitHub annotation when the envFlag
|
||||
// environment variable is set
|
||||
func Errorf(t *testing.T, format string, args ...interface{}) {
|
||||
t.Helper()
|
||||
|
|
@ -84,7 +84,7 @@ func Errorf(t *testing.T, format string, args ...interface{}) {
|
|||
}
|
||||
|
||||
// AnnotatedErrorf is similar to Errorf() but it also admits a msg string that
|
||||
// will be used as the Github annotation
|
||||
// will be used as the GitHub annotation
|
||||
func AnnotatedErrorf(t *testing.T, msg, format string, args ...interface{}) {
|
||||
t.Helper()
|
||||
echoAnnotationErr(t, msg)
|
||||
|
|
@ -93,7 +93,7 @@ func AnnotatedErrorf(t *testing.T, msg, format string, args ...interface{}) {
|
|||
|
||||
// Fatal is a wrapper around t.Fatal()
|
||||
// args are passed to t.Fatal(args) and each arg will be sent to stdout formatted
|
||||
// as a Github annotation when the envFlag environment variable is set
|
||||
// as a GitHub annotation when the envFlag environment variable is set
|
||||
func Fatal(t *testing.T, args ...interface{}) {
|
||||
t.Helper()
|
||||
echoAnnotationErr(t, args)
|
||||
|
|
@ -101,7 +101,7 @@ func Fatal(t *testing.T, args ...interface{}) {
|
|||
}
|
||||
|
||||
// AnnotatedFatal is similar to Fatal() but it also admits a msg string that
|
||||
// will be used as the Github annotation
|
||||
// will be used as the GitHub annotation
|
||||
func AnnotatedFatal(t *testing.T, msg string, args ...interface{}) {
|
||||
t.Helper()
|
||||
echoAnnotationErr(t, msg)
|
||||
|
|
@ -110,7 +110,7 @@ func AnnotatedFatal(t *testing.T, msg string, args ...interface{}) {
|
|||
|
||||
// Fatalf is a wrapper around t.Errorf()
|
||||
// format and args are passed to t.Fatalf(format, args) and the formatted
|
||||
// message will be sent to stdout as a Github annotation when the envFlag
|
||||
// message will be sent to stdout as a GitHub annotation when the envFlag
|
||||
// environment variable is set
|
||||
func Fatalf(t *testing.T, format string, args ...interface{}) {
|
||||
t.Helper()
|
||||
|
|
@ -119,7 +119,7 @@ func Fatalf(t *testing.T, format string, args ...interface{}) {
|
|||
}
|
||||
|
||||
// AnnotatedFatalf is similar to Fatalf() but it also admits a msg string that
|
||||
// will be used as the Github annotation
|
||||
// will be used as the GitHub annotation
|
||||
func AnnotatedFatalf(t *testing.T, msg, format string, args ...interface{}) {
|
||||
t.Helper()
|
||||
echoAnnotationErr(t, msg)
|
||||
|
|
@ -127,7 +127,7 @@ func AnnotatedFatalf(t *testing.T, msg, format string, args ...interface{}) {
|
|||
}
|
||||
|
||||
// AnnotatedWarn is a wrapper around t.Log() but it also admits a msg string that
|
||||
// will be used as the Github warning annotation
|
||||
// will be used as the GitHub warning annotation
|
||||
func AnnotatedWarn(t *testing.T, msg string, args ...interface{}) {
|
||||
t.Helper()
|
||||
echoAnnotationWarn(t, msg)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ func restoreStdout(outC chan string, origStdout *os.File) string {
|
|||
func TestError(t *testing.T) {
|
||||
msg := "This is an error"
|
||||
|
||||
// redirect stdout temporarily to catch the Github annotation output
|
||||
// redirect stdout temporarily to catch the GitHub annotation output
|
||||
origStdout, outC := redirectStdout(t)
|
||||
Error(&testing.T{}, msg)
|
||||
out := restoreStdout(outC, origStdout)
|
||||
|
|
@ -58,7 +58,7 @@ func TestAnnotatedErrorf(t *testing.T) {
|
|||
str := "foobar"
|
||||
msgDesc := "This is a generic error"
|
||||
|
||||
// redirect stdout temporarily to catch the Github annotation output
|
||||
// redirect stdout temporarily to catch the GitHub annotation output
|
||||
origStdout, outC := redirectStdout(t)
|
||||
AnnotatedErrorf(&testing.T{}, msgDesc, msgFormat, str)
|
||||
out := restoreStdout(outC, origStdout)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ helm install linkerd/linkerd-viz
|
|||
|
||||
## 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.
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ helm install linkerd/linkerd-viz
|
|||
|
||||
## 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.
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ var (
|
|||
alphaNumDash = regexp.MustCompile(`^[a-zA-Z0-9-]+$`)
|
||||
)
|
||||
|
||||
// NewCmdViz returns a new jeager command
|
||||
// NewCmdViz returns a new jaeger command
|
||||
func NewCmdViz() *cobra.Command {
|
||||
vizCmd := &cobra.Command{
|
||||
Use: "viz",
|
||||
|
|
|
|||
Loading…
Reference in New Issue