Merge pull request #27848 from liubin/fix-typos

Automatic merge from submit-queue

fix some typos

Just a minor typos fix.


Signed-off-by: bin liu <liubin0329@gmail.com>
This commit is contained in:
k8s-merge-robot 2016-07-06 23:36:49 -07:00 committed by GitHub
commit 0c696dc95b
14 changed files with 17 additions and 17 deletions

View File

@ -64,7 +64,7 @@ func (hk *HyperKube) FindServer(name string) (*Server, error) {
return nil, fmt.Errorf("Server not found: %s", name) return nil, fmt.Errorf("Server not found: %s", name)
} }
// Servers returns a list of all of the registred servers // Servers returns a list of all of the registered servers
func (hk *HyperKube) Servers() []Server { func (hk *HyperKube) Servers() []Server {
return hk.servers return hk.servers
} }

View File

@ -440,7 +440,7 @@ type HostPathVolumeSource struct {
type EmptyDirVolumeSource struct { type EmptyDirVolumeSource struct {
// TODO: Longer term we want to represent the selection of underlying // TODO: Longer term we want to represent the selection of underlying
// media more like a scheduling problem - user says what traits they // media more like a scheduling problem - user says what traits they
// need, we give them a backing store that satisifies that. For now // need, we give them a backing store that satisfies that. For now
// this will cover the most common needs. // this will cover the most common needs.
// Optional: what type of storage medium should back this directory. // Optional: what type of storage medium should back this directory.
// The default is "" which means to use the node's default medium. // The default is "" which means to use the node's default medium.
@ -2000,7 +2000,7 @@ type AttachedVolume struct {
// Name of the attached volume // Name of the attached volume
Name UniqueVolumeName `json:"name"` Name UniqueVolumeName `json:"name"`
// DevicePath represents the device path where the volume should be avilable // DevicePath represents the device path where the volume should be available
DevicePath string `json:"devicePath"` DevicePath string `json:"devicePath"`
} }
@ -2686,7 +2686,7 @@ const (
// TODO: Consider supporting different formats, specifying CA/destinationCA. // TODO: Consider supporting different formats, specifying CA/destinationCA.
SecretTypeTLS SecretType = "kubernetes.io/tls" SecretTypeTLS SecretType = "kubernetes.io/tls"
// TLSCertKey is the key for tls certificates in a TLS secert. // TLSCertKey is the key for tls certificates in a TLS secret.
TLSCertKey = "tls.crt" TLSCertKey = "tls.crt"
// TLSPrivateKeyKey is the key for the private key field in a TLS secret. // TLSPrivateKeyKey is the key for the private key field in a TLS secret.
TLSPrivateKeyKey = "tls.key" TLSPrivateKeyKey = "tls.key"

View File

@ -2250,7 +2250,7 @@ func ValidateNonEmptySelector(selectorMap map[string]string, fldPath *field.Path
return allErrs return allErrs
} }
// Validates the given template and ensures that it is in accordance with the desrired selector and replicas. // Validates the given template and ensures that it is in accordance with the desired selector and replicas.
func ValidatePodTemplateSpecForRC(template *api.PodTemplateSpec, selectorMap map[string]string, replicas int32, fldPath *field.Path) field.ErrorList { func ValidatePodTemplateSpecForRC(template *api.PodTemplateSpec, selectorMap map[string]string, replicas int32, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if template == nil { if template == nil {

View File

@ -641,7 +641,7 @@ type PodSecurityPolicySpec struct {
// Privileged determines if a pod can request to be run as privileged. // Privileged determines if a pod can request to be run as privileged.
Privileged bool `json:"privileged,omitempty"` Privileged bool `json:"privileged,omitempty"`
// DefaultAddCapabilities is the default set of capabilities that will be added to the container // DefaultAddCapabilities is the default set of capabilities that will be added to the container
// unless the pod spec specifically drops the capability. You may not list a capabiility in both // unless the pod spec specifically drops the capability. You may not list a capability in both
// DefaultAddCapabilities and RequiredDropCapabilities. // DefaultAddCapabilities and RequiredDropCapabilities.
DefaultAddCapabilities []api.Capability `json:"defaultAddCapabilities,omitempty"` DefaultAddCapabilities []api.Capability `json:"defaultAddCapabilities,omitempty"`
// RequiredDropCapabilities are the capabilities that will be dropped from the container. These // RequiredDropCapabilities are the capabilities that will be dropped from the container. These

View File

@ -59,7 +59,7 @@ func Initialize(c Capabilities) {
}) })
} }
// Setup the capability set. It wraps Initialize for improving usibility. // Setup the capability set. It wraps Initialize for improving usability.
func Setup(allowPrivileged bool, privilegedSources PrivilegedSources, perConnectionBytesPerSec int64) { func Setup(allowPrivileged bool, privilegedSources PrivilegedSources, perConnectionBytesPerSec int64) {
Initialize(Capabilities{ Initialize(Capabilities{
AllowPrivileged: allowPrivileged, AllowPrivileged: allowPrivileged,

View File

@ -573,7 +573,7 @@ func (r *Request) URL() *url.URL {
if len(r.resource) != 0 { if len(r.resource) != 0 {
p = path.Join(p, strings.ToLower(r.resource)) p = path.Join(p, strings.ToLower(r.resource))
} }
// Join trims trailing slashes, so preserve r.pathPrefix's trailing slash for backwards compat if nothing was changed // Join trims trailing slashes, so preserve r.pathPrefix's trailing slash for backwards compatibility if nothing was changed
if len(r.resourceName) != 0 || len(r.subpath) != 0 || len(r.subresource) != 0 { if len(r.resourceName) != 0 || len(r.subpath) != 0 || len(r.subresource) != 0 {
p = path.Join(p, r.resourceName, r.subresource, r.subpath) p = path.Join(p, r.resourceName, r.subresource, r.subpath)
} }

View File

@ -125,7 +125,7 @@ func (s *ServiceController) Run(serviceSyncPeriod, nodeSyncPeriod time.Duration)
return err return err
} }
// We have to make this check beecause the ListWatch that we use in // We have to make this check because the ListWatch that we use in
// WatchServices requires Client functions that aren't in the interface // WatchServices requires Client functions that aren't in the interface
// for some reason. // for some reason.
if _, ok := s.kubeClient.(*clientset.Clientset); !ok { if _, ok := s.kubeClient.(*clientset.Clientset); !ok {

View File

@ -771,7 +771,7 @@ func wrapTestWithControllerConfig(operation operationType, expectedOperationCall
// wrapTestWithInjectedOperation returns a testCall that: // wrapTestWithInjectedOperation returns a testCall that:
// - starts the controller and lets it run original testCall until // - starts the controller and lets it run original testCall until
// scheduleOperation() call. It blocks the controller there and calls the // scheduleOperation() call. It blocks the controller there and calls the
// injected function to simulate that something is happenning when the // injected function to simulate that something is happening when the
// controller waits for the operation lock. Controller is then resumed and we // controller waits for the operation lock. Controller is then resumed and we
// check how it behaves. // check how it behaves.
func wrapTestWithInjectedOperation(toWrap testCall, injectBeforeOperation func(ctrl *PersistentVolumeController, reactor *volumeReactor)) testCall { func wrapTestWithInjectedOperation(toWrap testCall, injectBeforeOperation func(ctrl *PersistentVolumeController, reactor *volumeReactor)) testCall {

View File

@ -26,7 +26,7 @@ type Equalities struct {
reflect.Equalities reflect.Equalities
} }
// For convenience, panics on errrors // For convenience, panics on errors
func EqualitiesOrDie(funcs ...interface{}) Equalities { func EqualitiesOrDie(funcs ...interface{}) Equalities {
e := Equalities{reflect.Equalities{}} e := Equalities{reflect.Equalities{}}
if err := e.AddFuncs(funcs...); err != nil { if err := e.AddFuncs(funcs...); err != nil {

View File

@ -469,7 +469,7 @@ func (l *Lexer) Lex() (tok Token, lit string) {
} }
} }
// Parser data structure contains the label selector parser data strucutre // Parser data structure contains the label selector parser data structure
type Parser struct { type Parser struct {
l *Lexer l *Lexer
scannedItems []ScannedItem scannedItems []ScannedItem

View File

@ -276,9 +276,9 @@ func TestUDPProxyTimeout(t *testing.T) {
} }
waitForNumProxyLoops(t, p, 1) waitForNumProxyLoops(t, p, 1)
testEchoUDP(t, "127.0.0.1", svcInfo.proxyPort) testEchoUDP(t, "127.0.0.1", svcInfo.proxyPort)
// When connecting to a UDP service endpoint, there shoule be a Conn for proxy. // When connecting to a UDP service endpoint, there should be a Conn for proxy.
waitForNumProxyClients(t, svcInfo, 1, time.Second) waitForNumProxyClients(t, svcInfo, 1, time.Second)
// If conn has no activity for serviceInfo.timeout since last Read/Write, it shoule be closed because of timeout. // If conn has no activity for serviceInfo.timeout since last Read/Write, it should be closed because of timeout.
waitForNumProxyClients(t, svcInfo, 0, 2*time.Second) waitForNumProxyClients(t, svcInfo, 0, 2*time.Second)
} }

View File

@ -79,7 +79,7 @@ func TestUntilReturnsImmediately(t *testing.T) {
func TestJitterUntil(t *testing.T) { func TestJitterUntil(t *testing.T) {
ch := make(chan struct{}) ch := make(chan struct{})
// if a channel is closed JitterUntil never calls function f // if a channel is closed JitterUntil never calls function f
// and returns imidiatelly // and returns immediately
close(ch) close(ch)
JitterUntil(func() { JitterUntil(func() {
t.Fatal("should not have been invoked") t.Fatal("should not have been invoked")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// Package types defines types used only by volume componenets // Package types defines types used only by volume components
package types package types
import "k8s.io/kubernetes/pkg/types" import "k8s.io/kubernetes/pkg/types"

View File

@ -193,7 +193,7 @@ func (a *OIDCAuthenticator) client() (*oidc.Client, error) {
} }
// SyncProviderConfig will start a goroutine to periodically synchronize the provider config. // SyncProviderConfig will start a goroutine to periodically synchronize the provider config.
// The synchronization interval is set by the expiration length of the config, and has a mininum // The synchronization interval is set by the expiration length of the config, and has a minimum
// and maximum threshold. // and maximum threshold.
stop := client.SyncProviderConfig(a.issuerURL) stop := client.SyncProviderConfig(a.issuerURL)
a.oidcClient.Store(client) a.oidcClient.Store(client)