github/capsule
1
0
Fork 0
mirror of https://github.com/projectcapsule/capsule.git synced 2026-02-14 18:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: hostname collision between different Tenant namespaces

Browse Source
This commit is contained in:
Dario Tranchitella
2021-03-06 18:01:42 +01:00
parent 51de469551
commit 4119a69e02
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/webhook/ingress/validating.go
View File

@@ -218,9 +218,9 @@ func (r *handler) validateCollision(ctx context.Context, clt client.Client, ingr
return nil
}
for _, hostname := range ingress.Hostnames() {
var err error
collisionErr := NewIngressHostnameCollision(hostname)
var err error
switch ingress.(type) {
case Extension:
el := &extensionsv1beta1.IngressList{}
@@ -231,11 +231,12 @@ func (r *handler) validateCollision(ctx context.Context, clt client.Client, ingr
}
switch len(el.Items) {
case 0:
continue
break
case 1:
if el.Items[0].GetName() != ingress.Name() {
return collisionErr
if f := el.Items[0]; f.GetName() == ingress.Name() && f.GetNamespace() == ingress.Namespace() {
break
}
fallthrough
default:
return collisionErr
}
@@ -249,11 +250,12 @@ func (r *handler) validateCollision(ctx context.Context, clt client.Client, ingr
}
switch len(nl.Items) {
case 0:
continue
break
case 1:
if nl.Items[0].GetName() != ingress.Name() {
return collisionErr
if f := nl.Items[0]; f.GetName() == ingress.Name() && f.GetNamespace() == ingress.Namespace() {
break
}
fallthrough
default:
return collisionErr
}
@@ -267,11 +269,12 @@ func (r *handler) validateCollision(ctx context.Context, clt client.Client, ingr
}
switch len(nlb.Items) {
case 0:
continue
break
case 1:
if nlb.Items[0].GetName() != ingress.Name() {
return collisionErr
if f := nlb.Items[0]; f.GetName() == ingress.Name() && f.GetNamespace() == ingress.Namespace() {
break
}
fallthrough
default:
return collisionErr
}