mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 13:37:30 +00:00
Merge pull request #31773 from pigmej/typos_englishify_some_pkgs
Automatic merge from submit-queue Typos and englishify pkg/cloudprovider + pkg/dns + pkg/kubectl **What this PR does / why we need it**: Just fixed some typos + "englishify" in pkg/cloudprovider + pkg/dns + pkg/kubectl **Which issue this PR fixes** : None **Special notes for your reviewer**: It's just fixes typos **Release note**: `NONE`
This commit is contained in:
commit
61dda4d34a
@ -1026,7 +1026,7 @@ func (c *Cloud) List(filter string) ([]string, error) {
|
|||||||
// It currently involves querying all instances
|
// It currently involves querying all instances
|
||||||
func (c *Cloud) getAllZones() (sets.String, error) {
|
func (c *Cloud) getAllZones() (sets.String, error) {
|
||||||
// We don't currently cache this; it is currently used only in volume
|
// We don't currently cache this; it is currently used only in volume
|
||||||
// creation which is expected to be a comparatively rare occurence.
|
// creation which is expected to be a comparatively rare occurrence.
|
||||||
|
|
||||||
// TODO: Caching / expose api.Nodes to the cloud provider?
|
// TODO: Caching / expose api.Nodes to the cloud provider?
|
||||||
// TODO: We could also query for subnets, I think
|
// TODO: We could also query for subnets, I think
|
||||||
|
@ -218,7 +218,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala
|
|||||||
|
|
||||||
// NOTE The documentation for the AWS API indicates we could get an HTTP 400
|
// NOTE The documentation for the AWS API indicates we could get an HTTP 400
|
||||||
// back if a policy of the same name already exists. However, the aws-sdk does not
|
// back if a policy of the same name already exists. However, the aws-sdk does not
|
||||||
// seem to return an error to us in these cases. Therefore this will issue an API
|
// seem to return an error to us in these cases. Therefore, this will issue an API
|
||||||
// request every time.
|
// request every time.
|
||||||
err := c.createProxyProtocolPolicy(loadBalancerName)
|
err := c.createProxyProtocolPolicy(loadBalancerName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -74,7 +74,7 @@ func configFromEnv() (*CSConfig, bool) {
|
|||||||
cfg.Global.Zone = os.Getenv("CS_ZONE")
|
cfg.Global.Zone = os.Getenv("CS_ZONE")
|
||||||
|
|
||||||
// It is save to ignore the error here. If the input cannot be parsed SSLNoVerify
|
// It is save to ignore the error here. If the input cannot be parsed SSLNoVerify
|
||||||
// will still be a bool with it's zero value (false) which is the expected default.
|
// will still be a bool with its zero value (false) which is the expected default.
|
||||||
cfg.Global.SSLNoVerify, _ = strconv.ParseBool(os.Getenv("CS_SSL_NO_VERIFY"))
|
cfg.Global.SSLNoVerify, _ = strconv.ParseBool(os.Getenv("CS_SSL_NO_VERIFY"))
|
||||||
|
|
||||||
// Check if we have the minimum required info to be able to connect to CloudStack.
|
// Check if we have the minimum required info to be able to connect to CloudStack.
|
||||||
|
@ -2605,7 +2605,7 @@ func (gce *GCECloud) getDiskByNameUnknownZone(diskName string) (*gceDisk, error)
|
|||||||
|
|
||||||
// GetGCERegion returns region of the gce zone. Zone names
|
// GetGCERegion returns region of the gce zone. Zone names
|
||||||
// are of the form: ${region-name}-${ix}.
|
// are of the form: ${region-name}-${ix}.
|
||||||
// For example "us-central1-b" has a region of "us-central1".
|
// For example, "us-central1-b" has a region of "us-central1".
|
||||||
// So we look for the last '-' and trim to just before that.
|
// So we look for the last '-' and trim to just before that.
|
||||||
func GetGCERegion(zone string) (string, error) {
|
func GetGCERegion(zone string) (string, error) {
|
||||||
ix := strings.LastIndex(zone, "-")
|
ix := strings.LastIndex(zone, "-")
|
||||||
|
@ -129,7 +129,7 @@ func (os *OpenStack) getVolume(diskName string) (volumes.Volume, error) {
|
|||||||
return false, errors.New(errmsg)
|
return false, errors.New(errmsg)
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Errorf("Error occured getting volume: %s", diskName)
|
glog.Errorf("Error occurred getting volume: %s", diskName)
|
||||||
return volume, err
|
return volume, err
|
||||||
}
|
}
|
||||||
return volume, err
|
return volume, err
|
||||||
|
@ -563,7 +563,7 @@ func (rs *Rackspace) getVolume(diskName string) (volumes.Volume, error) {
|
|||||||
return false, errors.New(errmsg)
|
return false, errors.New(errmsg)
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
glog.Errorf("Error occured getting volume: %s", diskName)
|
glog.Errorf("Error occurred getting volume: %s", diskName)
|
||||||
}
|
}
|
||||||
return volume, err
|
return volume, err
|
||||||
}
|
}
|
||||||
|
@ -742,7 +742,7 @@ func getNextUnitNumber(devices object.VirtualDeviceList, c types.BaseVirtualCont
|
|||||||
return int32(unitNumber), nil
|
return int32(unitNumber), nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return -1, fmt.Errorf("SCSI Controller with key=%d does not have any avaiable slots (LUN).", key)
|
return -1, fmt.Errorf("SCSI Controller with key=%d does not have any available slots (LUN).", key)
|
||||||
}
|
}
|
||||||
|
|
||||||
func getSCSIController(vmDevices object.VirtualDeviceList, scsiType string) *types.VirtualController {
|
func getSCSIController(vmDevices object.VirtualDeviceList, scsiType string) *types.VirtualController {
|
||||||
|
@ -99,7 +99,7 @@ type KubeDNS struct {
|
|||||||
// Map of cluster IP to service object. Headless services are not part of this map.
|
// Map of cluster IP to service object. Headless services are not part of this map.
|
||||||
// Used to get a service when given its cluster IP.
|
// Used to get a service when given its cluster IP.
|
||||||
// Access to this is coordinated using cacheLock. We use the same lock for cache and this map
|
// Access to this is coordinated using cacheLock. We use the same lock for cache and this map
|
||||||
// to ensure that they dont get out of sync.
|
// to ensure that they don't get out of sync.
|
||||||
clusterIPServiceMap map[string]*kapi.Service
|
clusterIPServiceMap map[string]*kapi.Service
|
||||||
|
|
||||||
// caller is responsible for using the cacheLock before invoking methods on cache
|
// caller is responsible for using the cacheLock before invoking methods on cache
|
||||||
@ -253,7 +253,7 @@ func (kd *KubeDNS) newService(obj interface{}) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if len(service.Spec.Ports) == 0 {
|
if len(service.Spec.Ports) == 0 {
|
||||||
glog.Warningf("Unexpected service with no ports, this should not have happend: %v", service)
|
glog.Warningf("Unexpected service with no ports, this should not have happened: %v", service)
|
||||||
}
|
}
|
||||||
kd.newPortalService(service)
|
kd.newPortalService(service)
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ func (cache *TreeCache) Serialize() (string, error) {
|
|||||||
func (cache *TreeCache) setEntry(key string, val *skymsg.Service, fqdn string, path ...string) {
|
func (cache *TreeCache) setEntry(key string, val *skymsg.Service, fqdn string, path ...string) {
|
||||||
// TODO: Consolidate setEntry and setSubCache into a single method with a
|
// TODO: Consolidate setEntry and setSubCache into a single method with a
|
||||||
// type switch.
|
// type switch.
|
||||||
// TODO: Insted of passing the fqdn as an argument, we can reconstruct
|
// TODO: Instead of passing the fqdn as an argument, we can reconstruct
|
||||||
// it from the path, provided callers always pass the full path to the
|
// it from the path, provided callers always pass the full path to the
|
||||||
// object. This is currently *not* the case, since callers first create
|
// object. This is currently *not* the case, since callers first create
|
||||||
// a new, empty node, populate it, then parent it under the right path.
|
// a new, empty node, populate it, then parent it under the right path.
|
||||||
|
@ -1779,7 +1779,7 @@ func extractCSRStatus(csr *certificates.CertificateSigningRequest) (string, erro
|
|||||||
case certificates.CertificateDenied:
|
case certificates.CertificateDenied:
|
||||||
denied = true
|
denied = true
|
||||||
default:
|
default:
|
||||||
return "", fmt.Errorf("unknown csr conditon %q", c)
|
return "", fmt.Errorf("unknown csr condition %q", c)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var status string
|
var status string
|
||||||
|
@ -367,7 +367,7 @@ func (reaper *PetSetReaper) Stop(namespace, name string, timeout time.Duration,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Cleanup volumes? We don't want to accidentally delete volumes from
|
// TODO: Cleanup volumes? We don't want to accidentally delete volumes from
|
||||||
// stop, so just leave this up to the the petset.
|
// stop, so just leave this up to the petset.
|
||||||
return petsets.Delete(name, nil)
|
return petsets.Delete(name, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -766,7 +766,7 @@ func TestDeploymentNotFoundError(t *testing.T) {
|
|||||||
return true, list, nil
|
return true, list, nil
|
||||||
})
|
})
|
||||||
fake.AddReactor("get", "replicasets", func(action testclient.Action) (handled bool, ret runtime.Object, err error) {
|
fake.AddReactor("get", "replicasets", func(action testclient.Action) (handled bool, ret runtime.Object, err error) {
|
||||||
return true, nil, ScaleError{ActualError: errors.NewNotFound(api.Resource("replicaset"), "doesnt-matter")}
|
return true, nil, ScaleError{ActualError: errors.NewNotFound(api.Resource("replicaset"), "doesn't-matter")}
|
||||||
})
|
})
|
||||||
|
|
||||||
reaper := DeploymentReaper{fake, time.Millisecond, time.Millisecond}
|
reaper := DeploymentReaper{fake, time.Millisecond, time.Millisecond}
|
||||||
|
Loading…
Reference in New Issue
Block a user