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

Remove annotations grpc-backend and secure-backend already deprecated

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-10-08 12:26:06 -03:00
parent 3cf00b2fd8
commit 859b298d42
14 changed files with 64 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/ingress/controller/template/template.go
View file

@ -456,12 +456,6 @@ func buildProxyPass(host string, b interface{}, loc interface{}, dynamicConfigur
proxyPass = "ajp_pass"
}
// TODO: Remove after the deprecation of grpc-backend annotation
if location.GRPC {
proxyPass = "grpc_pass"
proto = "grpc://"
}
upstreamName := "upstream_balancer"
if !dynamicConfigurationEnabled {
@ -470,11 +464,10 @@ func buildProxyPass(host string, b interface{}, loc interface{}, dynamicConfigur
for _, backend := range backends {
if backend.Name == location.Backend {
if backend.Secure || backend.SSLPassthrough {
// TODO: Remove after the deprecation of secure-backend annotation
if backend.SSLPassthrough {
proto = "https://"
// TODO: Remove after the deprecation of grpc-backend annotation
if location.GRPC {
if location.BackendProtocol == "GRPCS" {
proto = "grpcs://"
}
}
@ -974,7 +967,7 @@ func proxySetHeader(loc interface{}) string {
return "proxy_set_header"
}
if location.GRPC || location.BackendProtocol == "GRPC" || location.BackendProtocol == "GRPCS" {
if location.BackendProtocol == "GRPC" || location.BackendProtocol == "GRPCS" {
return "grpc_set_header"
}