Merge pull request #34041 from pigmej/fix_typos_plugin

Automatic merge from submit-queue

Fix typos and englishify plugin/pkg

**What this PR does / why we need it**:  Just typos

**Which issue this PR fixes**: `None`

**Special notes for your reviewer**: Just typos

**Release note**: `NONE`
This commit is contained in:
Kubernetes Submit Queue 2016-10-15 02:13:06 -07:00 committed by GitHub
commit 669efd72a4
5 changed files with 9 additions and 9 deletions

View File

@ -25,11 +25,11 @@ import (
) )
var ( var (
influxdbHost = flag.String("ir-influxdb-host", "localhost:8080/api/v1/proxy/namespaces/kube-system/services/monitoring-influxdb:api", "Address of InfluxDB which contains metrics requred by InitialResources") influxdbHost = flag.String("ir-influxdb-host", "localhost:8080/api/v1/proxy/namespaces/kube-system/services/monitoring-influxdb:api", "Address of InfluxDB which contains metrics required by InitialResources")
user = flag.String("ir-user", "root", "User used for connecting to InfluxDB") user = flag.String("ir-user", "root", "User used for connecting to InfluxDB")
// TODO: figure out how to better pass password here // TODO: figure out how to better pass password here
password = flag.String("ir-password", "root", "Password used for connecting to InfluxDB") password = flag.String("ir-password", "root", "Password used for connecting to InfluxDB")
db = flag.String("ir-dbname", "k8s", "InfluxDB database name which contains metrics requred by InitialResources") db = flag.String("ir-dbname", "k8s", "InfluxDB database name which contains metrics required by InitialResources")
hawkularConfig = flag.String("ir-hawkular", "", "Hawkular configuration URL") hawkularConfig = flag.String("ir-hawkular", "", "Hawkular configuration URL")
) )
@ -37,7 +37,7 @@ var (
// that dataSource will be moved to Heapster some time in the future and possibly rewritten. // that dataSource will be moved to Heapster some time in the future and possibly rewritten.
type dataSource interface { type dataSource interface {
// Returns <perc>th of sample values which represent usage of <kind> for containers running <image>, // Returns <perc>th of sample values which represent usage of <kind> for containers running <image>,
// withing time range (start, end), number of samples considered and error if occured. // within time range (start, end), number of samples considered and error if occurred.
// If <exactMatch> then take only samples that concern the same image (both name and take are the same), // If <exactMatch> then take only samples that concern the same image (both name and take are the same),
// otherwise consider also samples with the same image a possibly different tag. // otherwise consider also samples with the same image a possibly different tag.
GetUsagePercentile(kind api.ResourceName, perc int64, image, namespace string, exactMatch bool, start, end time.Time) (usage int64, samples int64, err error) GetUsagePercentile(kind api.ResourceName, perc int64, image, namespace string, exactMatch bool, start, end time.Time) (usage int64, samples int64, err error)

View File

@ -316,7 +316,7 @@ func copyQuotas(in []api.ResourceQuota) ([]api.ResourceQuota, error) {
return out, nil return out, nil
} }
// checkRequest verifies that the request does not exceed any quota constraint. it returns back a copy of quotas not yet persisted // checkRequest verifies that the request does not exceed any quota constraint. it returns a copy of quotas not yet persisted
// that capture what the usage would be if the request succeeded. It return an error if the is insufficient quota to satisfy the request // that capture what the usage would be if the request succeeded. It return an error if the is insufficient quota to satisfy the request
func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.Attributes) ([]api.ResourceQuota, error) { func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.Attributes) ([]api.ResourceQuota, error) {
namespace := a.GetNamespace() namespace := a.GetNamespace()
@ -361,7 +361,7 @@ func (e *quotaEvaluator) checkRequest(quotas []api.ResourceQuota, a admission.At
return quotas, nil return quotas, nil
} }
// Usage of some resources cannot be counted in isolation. For example when // Usage of some resources cannot be counted in isolation. For example, when
// the resource represents a number of unique references to external // the resource represents a number of unique references to external
// resource. In such a case an evaluator needs to process other objects in // resource. In such a case an evaluator needs to process other objects in
// the same namespace which needs to be known. // the same namespace which needs to be known.

View File

@ -72,7 +72,7 @@ type OIDCOptions struct {
UsernameClaim string UsernameClaim string
// GroupsClaim, if specified, causes the OIDCAuthenticator to try to populate the user's // GroupsClaim, if specified, causes the OIDCAuthenticator to try to populate the user's
// groups with a ID Token field. If the GrouppClaim field is present in a ID Token the value // groups with an ID Token field. If the GrouppClaim field is present in an ID Token the value
// must be a string or list of strings. // must be a string or list of strings.
GroupsClaim string GroupsClaim string
} }
@ -206,7 +206,7 @@ func (a *OIDCAuthenticator) client() (*oidc.Client, error) {
return client, nil return client, nil
} }
// AuthenticateToken decodes and verifies a ID Token using the OIDC client, if the verification succeeds, // AuthenticateToken decodes and verifies an ID Token using the OIDC client, if the verification succeeds,
// then it will extract the user info from the JWT claims. // then it will extract the user info from the JWT claims.
func (a *OIDCAuthenticator) AuthenticateToken(value string) (user.Info, bool, error) { func (a *OIDCAuthenticator) AuthenticateToken(value string) (user.Info, bool, error) {
jwt, err := jose.ParseJWT(value) jwt, err := jose.ParseJWT(value)

View File

@ -2022,7 +2022,7 @@ func TestInterPodAffinity(t *testing.T) {
pods: []*api.Pod{{Spec: api.PodSpec{NodeName: "machine1"}, ObjectMeta: api.ObjectMeta{Labels: podLabel}}}, pods: []*api.Pod{{Spec: api.PodSpec{NodeName: "machine1"}, ObjectMeta: api.ObjectMeta{Labels: podLabel}}},
node: &node1, node: &node1,
fits: false, fits: false,
test: "The labelSelector requirements(items of matchExpressions) are ANDed, the pod cannot schedule onto the node becasue one of the matchExpression item don't match.", test: "The labelSelector requirements(items of matchExpressions) are ANDed, the pod cannot schedule onto the node because one of the matchExpression item don't match.",
}, },
{ {
pod: &api.Pod{ pod: &api.Pod{

View File

@ -297,7 +297,7 @@ func calculateBalancedResourceAllocation(pod *api.Pod, podRequests *schedulercac
memoryFraction := fractionOfCapacity(totalResources.Memory, allocatableResources.Memory) memoryFraction := fractionOfCapacity(totalResources.Memory, allocatableResources.Memory)
score := int(0) score := int(0)
if cpuFraction >= 1 || memoryFraction >= 1 { if cpuFraction >= 1 || memoryFraction >= 1 {
// if requested >= capacity, the corresponding host should never be preferrred. // if requested >= capacity, the corresponding host should never be preferred.
score = 0 score = 0
} else { } else {
// Upper and lower boundary of difference between cpuFraction and memoryFraction are -1 and 1 // Upper and lower boundary of difference between cpuFraction and memoryFraction are -1 and 1