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

Fix errors on klog

Browse source
This commit is contained in:
Ricardo Katz 2024-02-27 12:46:02 -03:00
parent fc3258b67b
commit eae9dc5111
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/nginx/logger.go
View file

@ -33,11 +33,11 @@ func logger(address string) {
server.SetFormat(syslog.RFC3164) server.SetFormat(syslog.RFC3164)
server.SetHandler(handler) server.SetHandler(handler)
if err := server.ListenUDP(address); err != nil { if err := server.ListenUDP(address); err != nil {
klog.Fatalf("failed bind internal syslog: %w", err) klog.Fatalf("failed bind internal syslog: %s", err.Error())
} }
if err := server.Boot(); err != nil { if err := server.Boot(); err != nil {
klog.Fatalf("failed to boot internal syslog: %w", err) klog.Fatalf("failed to boot internal syslog: %s", err.Error())
} }
klog.Infof("Is Chrooted, starting logger") klog.Infof("Is Chrooted, starting logger")

8
internal/ingress/annotations/rewrite/main.go
View file

@ -152,14 +152,14 @@ func (a rewrite) Parse(ing *networking.Ingress) (interface{}, error) {
config.SSLRedirect, err = parser.GetBoolAnnotation(sslRedirectAnnotation, ing, a.annotationConfig.Annotations) config.SSLRedirect, err = parser.GetBoolAnnotation(sslRedirectAnnotation, ing, a.annotationConfig.Annotations)
if err != nil { if err != nil {
if errors.IsValidationError(err) { if errors.IsValidationError(err) {
klog.Warningf("%sis invalid, defaulting to '%s'", sslRedirectAnnotation, a.r.GetDefaultBackend().SSLRedirect) klog.Warningf("%s is invalid, defaulting to '%t'", sslRedirectAnnotation, a.r.GetDefaultBackend().SSLRedirect)
} }
config.SSLRedirect = a.r.GetDefaultBackend().SSLRedirect config.SSLRedirect = a.r.GetDefaultBackend().SSLRedirect
} }
config.PreserveTrailingSlash, err = parser.GetBoolAnnotation(preserveTrailingSlashAnnotation, ing, a.annotationConfig.Annotations) config.PreserveTrailingSlash, err = parser.GetBoolAnnotation(preserveTrailingSlashAnnotation, ing, a.annotationConfig.Annotations)
if err != nil { if err != nil {
if errors.IsValidationError(err) { if errors.IsValidationError(err) {
klog.Warningf("%sis invalid, defaulting to '%s'", preserveTrailingSlashAnnotation, a.r.GetDefaultBackend().PreserveTrailingSlash) klog.Warningf("%s is invalid, defaulting to '%t'", preserveTrailingSlashAnnotation, a.r.GetDefaultBackend().PreserveTrailingSlash)
} }
config.PreserveTrailingSlash = a.r.GetDefaultBackend().PreserveTrailingSlash config.PreserveTrailingSlash = a.r.GetDefaultBackend().PreserveTrailingSlash
} }
@ -167,7 +167,7 @@ func (a rewrite) Parse(ing *networking.Ingress) (interface{}, error) {
config.ForceSSLRedirect, err = parser.GetBoolAnnotation(forceSSLRedirectAnnotation, ing, a.annotationConfig.Annotations) config.ForceSSLRedirect, err = parser.GetBoolAnnotation(forceSSLRedirectAnnotation, ing, a.annotationConfig.Annotations)
if err != nil { if err != nil {
if errors.IsValidationError(err) { if errors.IsValidationError(err) {
klog.Warningf("%sis invalid, defaulting to '%s'", forceSSLRedirectAnnotation, a.r.GetDefaultBackend().ForceSSLRedirect) klog.Warningf("%s is invalid, defaulting to '%t'", forceSSLRedirectAnnotation, a.r.GetDefaultBackend().ForceSSLRedirect)
} }
config.ForceSSLRedirect = a.r.GetDefaultBackend().ForceSSLRedirect config.ForceSSLRedirect = a.r.GetDefaultBackend().ForceSSLRedirect
} }
@ -175,7 +175,7 @@ func (a rewrite) Parse(ing *networking.Ingress) (interface{}, error) {
config.UseRegex, err = parser.GetBoolAnnotation(useRegexAnnotation, ing, a.annotationConfig.Annotations) config.UseRegex, err = parser.GetBoolAnnotation(useRegexAnnotation, ing, a.annotationConfig.Annotations)
if err != nil { if err != nil {
if errors.IsValidationError(err) { if errors.IsValidationError(err) {
klog.Warningf("%sis invalid, defaulting to 'false'", useRegexAnnotation) klog.Warningf("%s is invalid, defaulting to 'false'", useRegexAnnotation)
} }
config.UseRegex = false config.UseRegex = false
} }