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

Merge pull request #3016 from diazjf/better-logging

Browse source 
Log Errors Missing in Internal
This commit is contained in:
k8s-ci-robot 2018-09-05 05:18:33 -07:00 • committed by GitHub
commit 3f6314aa2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/controller/controller.go
View file

@ -773,7 +773,7 @@ func (n *NGINXController) getServiceClusterEndpoint(svcKey string, backend *exte
}
}
if port == -1 {
return endpoint, fmt.Errorf("Service %q does not have a port named %q", svc.Name, backend.ServicePort)
return endpoint, fmt.Errorf("service %q does not have a port named %q", svc.Name, backend.ServicePort)
}
endpoint.Port = fmt.Sprintf("%d", port)
} else {

4
internal/ingress/controller/nginx.go
View file

@ -395,7 +395,7 @@ func (n NGINXController) DefaultEndpoint() ingress.Endpoint {
// running the command "nginx -t" using a temporal file.
func (n NGINXController) testTemplate(cfg []byte) error {
if len(cfg) == 0 {
return fmt.Errorf("Invalid NGINX configuration (empty)")
return fmt.Errorf("invalid NGINX configuration (empty)")
}
tmpfile, err := ioutil.TempFile("", "nginx-cfg")
if err != nil {
@ -848,7 +848,7 @@ func post(url string, data interface{}) error {
}()
if resp.StatusCode != http.StatusCreated {
return fmt.Errorf("Unexpected error code: %d", resp.StatusCode)
return fmt.Errorf("unexpected error code: %d", resp.StatusCode)
}
return nil

4
internal/ingress/controller/store/backend_ssl.go
View file

@ -134,7 +134,7 @@ func (s k8sStore) getPemCertificate(secretName string) (*ingress.SSLCert, error)
return nil, ErrSecretForAuth
}
return nil, fmt.Errorf("Secret %q contains no keypair or CA certificate", secretName)
return nil, fmt.Errorf("secret %q contains no keypair or CA certificate", secretName)
}
sslCert.Name = secret.Name
@ -209,7 +209,7 @@ func (s *k8sStore) sendDummyEvent() {
}
// ErrSecretForAuth error to indicate a secret is used for authentication
var ErrSecretForAuth = fmt.Errorf("Secret is used for authentication")
var ErrSecretForAuth = fmt.Errorf("secret is used for authentication")
func isErrSecretForAuth(e error) bool {
return e == ErrSecretForAuth