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

Implement Equaler

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-06-14 19:40:25 -04:00
parent 75a4a61254
commit 92eeb7828b
12 changed files with 560 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/pkg/ingress/annotations/authreq/main.go
View file

@ -44,7 +44,7 @@ type External struct {
SigninURL string `json:"signinUrl"`
Method string `json:"method"`
SendBody bool `json:"sendBody"`
ResponseHeaders []string `json:"responseHeaders"`
ResponseHeaders []string `json:"responseHeaders,omitEmpty"`
}
func (e1 *External) Equal(e2 *External) bool {

6
core/pkg/ingress/annotations/authtls/main.go
View file

@ -36,8 +36,8 @@ const (
// AuthSSLConfig contains the AuthSSLCert used for muthual autentication
// and the configured ValidationDepth
type AuthSSLConfig struct {
AuthSSLCert resolver.AuthSSLCert
ValidationDepth int `json:"validationDepth"`
AuthSSLCert resolver.AuthSSLCert `json:"authSSLCert"`
ValidationDepth int `json:"validationDepth"`
}
func (assl1 *AuthSSLConfig) Equal(assl2 *AuthSSLConfig) bool {
@ -47,7 +47,7 @@ func (assl1 *AuthSSLConfig) Equal(assl2 *AuthSSLConfig) bool {
if assl1 == nil || assl2 == nil {
return false
}
if (&assl1.AuthSSLCert).Equal(&assl2.AuthSSLCert) {
if !(&assl1.AuthSSLCert).Equal(&assl2.AuthSSLCert) {
return false
}
if assl1.ValidationDepth != assl2.ValidationDepth {

6
core/pkg/ingress/annotations/ipwhitelist/main.go
View file

@ -36,7 +36,7 @@ const (
// SourceRange returns the CIDR
type SourceRange struct {
CIDR []string `json:"cidr"`
CIDR []string `json:"cidr,omitEmpty"`
}
func (sr1 *SourceRange) Equal(sr2 *SourceRange) bool {
@ -47,6 +47,10 @@ func (sr1 *SourceRange) Equal(sr2 *SourceRange) bool {
return false
}
if len(sr1.CIDR) != len(sr2.CIDR) {
return false
}
for _, s1l := range sr1.CIDR {
found := false
for _, sl2 := range sr2.CIDR {

4
core/pkg/ingress/annotations/ratelimit/main.go
View file

@ -54,10 +54,10 @@ func (rt1 *RateLimit) Equal(rt2 *RateLimit) bool {
if rt1 == nil || rt2 == nil {
return false
}
if (&rt1.Connections).Equal(&rt2.Connections) {
if !(&rt1.Connections).Equal(&rt2.Connections) {
return false
}
if (&rt1.RPS).Equal(&rt2.RPS) {
if !(&rt1.RPS).Equal(&rt2.RPS) {
return false
}

5
core/pkg/ingress/annotations/secureupstream/main.go
View file

@ -18,6 +18,7 @@ package secureupstream
import (
"fmt"
"github.com/pkg/errors"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
@ -32,8 +33,8 @@ const (
// Secure describes SSL backend configuration
type Secure struct {
Secure bool
CACert resolver.AuthSSLCert
Secure bool `json:"secure"`
CACert resolver.AuthSSLCert `json:"caCert"`
}
type su struct {