Skip to content

Always respect -ingress-class option #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2018
Merged

Always respect -ingress-class option #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions nginx-controller/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import (

const (
ingressClassKey = "kubernetes.io/ingress.class"
nginxIngressClass = "nginx"
)

// LoadBalancerController watches Kubernetes API and
Expand Down Expand Up @@ -1046,13 +1045,10 @@ func (lbc *LoadBalancerController) isNginxIngress(ing *extensions.Ingress) bool
if lbc.useIngressClassOnly {
return class == lbc.ingressClass
}
return class == nginxIngressClass || class == ""
return class == lbc.ingressClass || class == ""
} else {
if lbc.useIngressClassOnly {
return false
}
return ! lbc.useIngressClassOnly
}
return true
}

// ValidateSecret validates that the secret follows the TLS Secret format.
Expand Down