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

use the annotation key from k8s

Browse source
This commit is contained in:
Tony Li 2017-02-01 16:01:51 -05:00 committed by Tony Li
parent 9cf84cb9b4
commit 7de171e152
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
controllers/gce/controller/utils.go
View file

@ -45,14 +45,6 @@ const (
// rules for port 443 based on the TLS section.
allowHTTPKey = "kubernetes.io/ingress.allow-http"
// useNamedTLS tells the Ingress controller to use a specific GCE
// SSL certificate for its target proxies. If specified, the Ingress controller
// assigns the SSL certifiate by this name to the target proxies of the given
// Ingress. The controller *does not* manage this certificate, it is the users
// responsibility to create/delete it.
// TODO: naming this (ie: external-ssl-cert)
useNamedTLS = "kubernetes.io/ingress.use-named-tls"
// staticIPNameKey tells the Ingress controller to use a specific GCE
// static ip for its forwarding rules. If specified, the Ingress controller
// assigns the static ip by this name to the forwarding rules of the given
@ -87,8 +79,10 @@ func (ing ingAnnotations) allowHTTP() bool {
return v
}
// useNamedTLS returns the name of the GCE SSL certificate. Empty by default.
// TODO: naming this (ie: external-ssl-cert)
func (ing ingAnnotations) useNamedTLS() string {
val, ok := ing[useNamedTLS]
val, ok := ing[extensions.IngressPreSharedCertAnnotationKey]
if !ok {
return ""
}