Remove interface type from annotations.Ingress struct

This commit is contained in:
Alex Kursell 2019-02-22 10:14:09 -05:00
parent f53cacd5e1
commit 521be9b258
3 changed files with 5 additions and 4 deletions

View file

@ -80,7 +80,8 @@ type Ingress struct {
CorsConfig cors.Config CorsConfig cors.Config
CustomHTTPErrors []int CustomHTTPErrors []int
DefaultBackend *apiv1.Service DefaultBackend *apiv1.Service
Denied error //TODO: Change this back into an error when https://github.com/imdario/mergo/issues/100 is resolved
Denied string
ExternalAuth authreq.Config ExternalAuth authreq.Config
HTTP2PushPreload bool HTTP2PushPreload bool
Proxy proxy.Config Proxy proxy.Config
@ -182,7 +183,7 @@ func (e Extractor) Extract(ing *extensions.Ingress) *Ingress {
_, alreadyDenied := data[DeniedKeyName] _, alreadyDenied := data[DeniedKeyName]
if !alreadyDenied { if !alreadyDenied {
data[DeniedKeyName] = err data[DeniedKeyName] = err.Error()
klog.Errorf("error reading %v annotation in Ingress %v/%v: %v", name, ing.GetNamespace(), ing.GetName(), err) klog.Errorf("error reading %v annotation in Ingress %v/%v: %v", name, ing.GetNamespace(), ing.GetName(), err)
continue continue
} }

View file

@ -611,7 +611,7 @@ func isLocationAllowed(input interface{}) bool {
return false return false
} }
return loc.Denied == nil return loc.Denied == ""
} }
var ( var (

View file

@ -239,7 +239,7 @@ type Location struct {
BasicDigestAuth auth.Config `json:"basicDigestAuth,omitempty"` BasicDigestAuth auth.Config `json:"basicDigestAuth,omitempty"`
// Denied returns an error when this location cannot not be allowed // Denied returns an error when this location cannot not be allowed
// Requesting a denied location should return HTTP code 403. // Requesting a denied location should return HTTP code 403.
Denied error `json:"denied,omitempty"` Denied string `json:"denied,omitempty"`
// CorsConfig returns the Cors Configuration for the ingress rule // CorsConfig returns the Cors Configuration for the ingress rule
// +optional // +optional
CorsConfig cors.Config `json:"corsConfig,omitempty"` CorsConfig cors.Config `json:"corsConfig,omitempty"`