github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93834 from loopever/master

Browse Source 
fix typos in cmd/kubeadm and cmd/kube-scheduler
This commit is contained in:
Kubernetes Prow Robot 2020-08-27 10:38:06 -07:00 committed by GitHub
commit f542e86779
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-scheduler/app/options/insecure_serving.go
View File

@ -92,7 +92,7 @@ func (o *CombinedInsecureServingOptions) ApplyTo(c *schedulerappconfig.Config, c
return o.applyTo(c, componentConfig) return o.applyTo(c, componentConfig)
} }
// ApplyToFromLoadedConfig updates the insecure serving options from the component config and then appies it to the given scheduler app configuration. // ApplyToFromLoadedConfig updates the insecure serving options from the component config and then applies it to the given scheduler app configuration.
func (o *CombinedInsecureServingOptions) ApplyToFromLoadedConfig(c *schedulerappconfig.Config, componentConfig *kubeschedulerconfig.KubeSchedulerConfiguration) error { func (o *CombinedInsecureServingOptions) ApplyToFromLoadedConfig(c *schedulerappconfig.Config, componentConfig *kubeschedulerconfig.KubeSchedulerConfiguration) error {
if o == nil { if o == nil {
return nil return nil

4
cmd/kubeadm/app/phases/certs/renewal/filerenewer.go
View File

@ -23,13 +23,13 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil"
) )
// FileRenewer define a certificate renewer implementation that uses given CA cert and key for generating new certficiates // FileRenewer define a certificate renewer implementation that uses given CA cert and key for generating new certificates
type FileRenewer struct { type FileRenewer struct {
caCert *x509.Certificate caCert *x509.Certificate
caKey crypto.Signer caKey crypto.Signer
} }
// NewFileRenewer returns a new certificate renewer that uses given CA cert and key for generating new certficiates // NewFileRenewer returns a new certificate renewer that uses given CA cert and key for generating new certificates
func NewFileRenewer(caCert *x509.Certificate, caKey crypto.Signer) *FileRenewer { func NewFileRenewer(caCert *x509.Certificate, caKey crypto.Signer) *FileRenewer {
return &FileRenewer{ return &FileRenewer{
caCert: caCert, caCert: caCert,