Add Ingress TLS support (#1326)

This PR aims to add the Ingress TLS support by specifying the
TLS secret when creating/updating the HTTP trigger.

Command example:

fission route create --name foo \
    --url /foo/{bar} --function foofn --createingress \
    --ingressannotation "nginx.ingress.kubernetes.io/ssl-redirect=false" \
    --ingressannotation "nginx.ingress.kubernetes.io/use-regex=true" \
    --ingressrule "*=/foo/*"
    --ingresstls "foobartls"
This commit is contained in:
Ta-Ching Chen
2019-09-27 00:49:23 +08:00
committed by GitHub
parent 49d60b19f3
commit b5341edec0
8 changed files with 288 additions and 15 deletions
+20 -1
View File
@@ -24,7 +24,7 @@ import (
)
// GetIngressConfig returns an IngressConfig based on user inputs; return error if any.
func GetIngressConfig(annotations []string, rule string, fallbackRelativeURL string, oldIngressConfig *fv1.IngressConfig) (*fv1.IngressConfig, error) {
func GetIngressConfig(annotations []string, rule string, tls string, fallbackRelativeURL string, oldIngressConfig *fv1.IngressConfig) (*fv1.IngressConfig, error) {
removeAnns, anns, err := getIngressAnnotations(annotations)
if err != nil {
@@ -34,6 +34,7 @@ func GetIngressConfig(annotations []string, rule string, fallbackRelativeURL str
if err != nil {
return nil, err
}
removeTLS, secret := getIngressTLS(tls)
if oldIngressConfig == nil {
if isEmptyRule { // assign default value
@@ -44,6 +45,7 @@ func GetIngressConfig(annotations []string, rule string, fallbackRelativeURL str
Annotations: anns,
Host: host,
Path: path,
TLS: secret,
}, nil
}
@@ -73,6 +75,12 @@ func GetIngressConfig(annotations []string, rule string, fallbackRelativeURL str
oldIngressConfig.Path = path
}
if removeTLS {
oldIngressConfig.TLS = ""
} else if len(secret) > 0 {
oldIngressConfig.TLS = secret
}
return oldIngressConfig, nil
}
@@ -116,3 +124,14 @@ func getIngressHostRule(rule string, fallbackPath string) (empty bool, host stri
}
return false, v[0], v[1], nil
}
func getIngressTLS(secret string) (remove bool, tls string) {
switch secret {
case "-":
return true, ""
case "":
return false, ""
default:
return false, secret
}
}