Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Shvedunov committed Oct 13, 2016
1 parent 9b3ca2f commit 2b427f7
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions docs/proposals/resource-metrics-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ due to performance issues.
#### Scheduler

Scheduler in order to schedule best-effort pods requires node level resource usage metrics
as an average aggreated across 1 minute (the window may change in the future).
as an average aggregated across 1 minute (the window may change in the future).
The metrics should be available for all resources supported in the scheduler.
Currently the scheduler does not need this information, because it schedules best-effort pods
without considering node usage. But having the metrics available in the API server is a blocker
Expand Down Expand Up @@ -98,7 +98,7 @@ it will be probably possible to provide a reasonable implementation of the featu
#### Kubernetes dashboard

[Kubernetes dashboard](https://github.com/kubernetes/dashboard) in order to draw graphs requires resource usage
in timeseries format from relatively long period of time. The aggreations should be also possible on various levels
in timeseries format from relatively long period of time. The aggregations should be also possible on various levels
including replication controllers, deployments, services, etc.

Since the use case is complicated it will not be supported initally in the API and they will query Heapster
Expand Down Expand Up @@ -168,7 +168,7 @@ The following query parameters are supported:
- `labelSelector` - restrict the list of returned objects by labels (list endpoints only)

In the future we may want to introduce the following params:
`aggreator` (`max`, `min`, `95th`, etc.) and `window` (`1h`, `1d`, `1w`, etc.)
`aggregator` (`max`, `min`, `95th`, etc.) and `window` (`1h`, `1d`, `1w`, etc.)
which will allow to get the other aggregates over the custom time window.

## Further improvements
Expand All @@ -177,7 +177,7 @@ Depending on the further requirements the following features may be added:
- support for more metrics
- support for application level metrics
- watch for metrics
- possibility to query for window sizes and aggreation functions (though single window size/aggregation function per request)
- possibility to query for window sizes and aggregation functions (though single window size/aggregation function per request)
- cluster level metrics

<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
Expand Down
2 changes: 1 addition & 1 deletion examples/javaweb-tomcat-sidecar/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Documentation for other releases can be found at

<!-- END MUNGE: UNVERSIONED_WARNING -->

## Java Web Application with Tomcat and Sidercar Container
## Java Web Application with Tomcat and Sidecar Container

The following document describes the deployment of a Java Web application using Tomcat. Instead of packaging `war` file inside the Tomcat image or mount the `war` as a volume, we use a sidecar container as `war` file provider.

Expand Down
2 changes: 1 addition & 1 deletion pkg/cloudprovider/providers/azure/azure_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func TestReconcileLoadBalancerRemoveAllPortsRemovesFrontendConfig(t *testing.T)
t.Error("Expected the loadbalancer to need an update")
}

// ensure we abandonded the frontend ip configuration
// ensure we abandoned the frontend ip configuration
if len(*lb.Properties.FrontendIPConfigurations) != 0 {
t.Error("Expected the loadbalancer to have no frontend ip configuration")
}
Expand Down
2 changes: 1 addition & 1 deletion plugin/pkg/admission/antiaffinity/admission_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func TestInterPodAffinityAdmission(t *testing.T) {
"thisIsAInvalidAffinity": [{}
}}`,
},
// however, we should not got error here
// however, we should not get error here
errorExpected: false,
},
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/kubelet_perf.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ var _ = framework.KubeDescribe("Kubelet [Serial] [Slow]", func() {
// affect the runtime cpu usage. Fail the test if prepulling cannot
// finish in time.
if err := framework.WaitForPodsSuccess(f.Client, api.NamespaceSystem, framework.ImagePullerLabels, imagePrePullingLongTimeout); err != nil {
framework.Failf("Image puller didn't complete in %v, not running resource usage test since the metrics might be adultrated", imagePrePullingLongTimeout)
framework.Failf("Image puller didn't complete in %v, not running resource usage test since the metrics might be adulterated", imagePrePullingLongTimeout)
}
nodes := framework.GetReadySchedulableNodesOrDie(f.Client)
nodeNames = sets.NewString()
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/security_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

/* This test check that SecurityContext parameters specified at the
* pod or the container level work as intended. These tests cannot be
* run when the 'SecurityContextDeny' addmissioin controller is not used
* run when the 'SecurityContextDeny' admission controller is not used
* so they are skipped by default.
*/

Expand Down

0 comments on commit 2b427f7

Please sign in to comment.