DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #438 from Collaborne/pr/error-messages

Browse source 
Improve English in error messages
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-03-14 10:28:45 -03:00 committed by GitHub
commit 7b79c66d9d
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/pkg/ingress/controller/backend_ssl.go
View file

@ -90,10 +90,10 @@ func (ic *GenericController) syncSecret(k interface{}) error {
func (ic *GenericController) getPemCertificate(secretName string) (*ingress.SSLCert, error) { func (ic *GenericController) getPemCertificate(secretName string) (*ingress.SSLCert, error) {
secretInterface, exists, err := ic.secrLister.Store.GetByKey(secretName) secretInterface, exists, err := ic.secrLister.Store.GetByKey(secretName)
if err != nil { if err != nil {
return nil, fmt.Errorf("error retriveing secret %v: %v", secretName, err) return nil, fmt.Errorf("error retrieving secret %v: %v", secretName, err)
} }
if !exists { if !exists {
return nil, fmt.Errorf("secret named %v does not exists", secretName) return nil, fmt.Errorf("secret named %v does not exist", secretName)
} }
secret := secretInterface.(*api.Secret) secret := secretInterface.(*api.Secret)

6
core/pkg/ingress/controller/controller.go
View file

@ -564,7 +564,7 @@ func (ic *GenericController) getDefaultUpstream() *ingress.Backend {
} }
if !svcExists { if !svcExists {
glog.Warningf("service %v does not exists", svcKey) glog.Warningf("service %v does not exist", svcKey)
upstream.Endpoints = append(upstream.Endpoints, newDefaultServer()) upstream.Endpoints = append(upstream.Endpoints, newDefaultServer())
return upstream return upstream
} }
@ -706,7 +706,7 @@ func (ic GenericController) GetAuthCertificate(secretName string) (*resolver.Aut
bc, exists := ic.sslCertTracker.Get(secretName) bc, exists := ic.sslCertTracker.Get(secretName)
if !exists { if !exists {
return &resolver.AuthSSLCert{}, fmt.Errorf("secret %v does not exists", secretName) return &resolver.AuthSSLCert{}, fmt.Errorf("secret %v does not exist", secretName)
} }
cert := bc.(*ingress.SSLCert) cert := bc.(*ingress.SSLCert)
return &resolver.AuthSSLCert{ return &resolver.AuthSSLCert{
@ -805,7 +805,7 @@ func (ic *GenericController) serviceEndpoints(svcKey, backendPort string,
} }
if !svcExists { if !svcExists {
err = fmt.Errorf("service %v does not exists", svcKey) err = fmt.Errorf("service %v does not exist", svcKey)
return upstreams, err return upstreams, err
} }

2
core/pkg/ingress/controller/named_port.go
View file

@ -32,7 +32,7 @@ import (
) )
// checkSvcForUpdate verifies if one of the running pods for a service contains // checkSvcForUpdate verifies if one of the running pods for a service contains
// named port. If the annotation in the service does not exists or is not equals // named port. If the annotation in the service does not exist or is not equals
// to the port mapping obtained from the pod the service must be updated to reflect // to the port mapping obtained from the pod the service must be updated to reflect
// the current state // the current state
func (ic *GenericController) checkSvcForUpdate(svc *api.Service) error { func (ic *GenericController) checkSvcForUpdate(svc *api.Service) error {